banner种类增加；集合详情增加作者；排行榜轮换功能
This commit is contained in:
parent
fa0d9e973c
commit
9fb819b6fe
@ -13,7 +13,7 @@ public class BannerController : MonoBehaviour
|
||||
// Start is called before the first frame update
|
||||
private List<CanvasGroup> itemList;
|
||||
private List<Vector3> standardPositions;
|
||||
private List<MapRouteAreaItem> list;
|
||||
private List<Recommand> list;
|
||||
private int currentIndex = 1;
|
||||
void Awake()
|
||||
{
|
||||
@ -108,7 +108,7 @@ public class BannerController : MonoBehaviour
|
||||
}
|
||||
async void GetList()
|
||||
{
|
||||
var res = await ConfigHelper.mapApi.GetRecommendAreaList();
|
||||
var res = await ConfigHelper.mapApi.GetRecommendList();
|
||||
if (res.result)
|
||||
{
|
||||
if (res.data.Count >= 3)
|
||||
@ -123,13 +123,14 @@ public class BannerController : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
public void Initial(List<MapRouteAreaItem> list)
|
||||
public void Initial(List<Recommand> list)
|
||||
{
|
||||
int index = 0;
|
||||
foreach (CanvasGroup c in itemList)
|
||||
{
|
||||
var area = list[index++];
|
||||
c.GetComponent<NewRouteItemController>().Initial(area);
|
||||
|
||||
c.GetComponent<RecommendController>().Initial(area);
|
||||
c.GetComponent<Button>().onClick.RemoveAllListeners();
|
||||
if (c.alpha != 1)
|
||||
{
|
||||
@ -167,7 +168,7 @@ public class BannerController : MonoBehaviour
|
||||
se.Join(center.GetComponent<RectTransform>().DOLocalMoveX(43, 0.3f));
|
||||
se.Join(right.GetComponent<RectTransform>().DOLocalMoveX(-43, 0.3f));
|
||||
var area = list[((currentIndex++) + list.Count) % list.Count];
|
||||
right.GetComponent<NewRouteItemController>().Initial(area);
|
||||
right.GetComponent<RecommendController>().Initial(area);
|
||||
if (currentIndex >= list.Count) currentIndex = 0;
|
||||
se.Join(left.DOFade(1, 0.3f));
|
||||
se.Join(left.GetComponent<RectTransform>().DOScale(Vector3.one, 0.3f));
|
||||
@ -201,7 +202,7 @@ public class BannerController : MonoBehaviour
|
||||
se.Join(left.GetComponent<RectTransform>().DOLocalMoveX(43, 0.3f));
|
||||
var area = list[((currentIndex--) + list.Count) % list.Count];
|
||||
var centerArea = list[currentIndex + 1];
|
||||
left.GetComponent<NewRouteItemController>().Initial(area);
|
||||
left.GetComponent<RecommendController>().Initial(area);
|
||||
if (currentIndex < 0) currentIndex = list.Count - 1;
|
||||
se.Join(right.DOFade(1, 0.3f));
|
||||
se.Join(right.GetComponent<RectTransform>().DOScale(Vector3.one, 0.3f));
|
||||
@ -233,7 +234,7 @@ public class BannerController : MonoBehaviour
|
||||
se.Append(c.transform.DOScale(1f * Vector3.one, 0.15f));
|
||||
se.Play().onComplete = ()=>
|
||||
{
|
||||
UIManager.ShowNewRouteDetailPanel(c.GetComponent<NewRouteItemController>().Area);
|
||||
c.GetComponent<RecommendController>().DoWithType();
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
63
Assets/RecommendController.cs
Normal file
63
Assets/RecommendController.cs
Normal file
@ -0,0 +1,63 @@
|
||||
using Assets.Scripts;
|
||||
using Assets.Scripts.Apis.Models;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class RecommendController : MonoBehaviour
|
||||
{
|
||||
public Recommand Area { get; private set; }
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void Initial(Recommand area, Dictionary<string, Texture> caches = null)
|
||||
{
|
||||
transform.Find("Panel/Text").GetComponent<Text>().text = area.Title;
|
||||
Utils.DisplayImageTempDict(GetComponent<RawImage>(), area.CoverImage, caches);
|
||||
this.Area = area;
|
||||
GetComponent<Button>().onClick.RemoveAllListeners();
|
||||
GetComponent<Button>().onClick.AddListener(() =>
|
||||
{
|
||||
DoWithType();
|
||||
});
|
||||
}
|
||||
|
||||
public async void DoWithType()
|
||||
{
|
||||
if (Area == null) return;
|
||||
switch (Area.Type)
|
||||
{
|
||||
case 0:
|
||||
//路线
|
||||
App.RouteIdParam = Area.RouteId;
|
||||
SceneManager.LoadScene("Ride");
|
||||
break;
|
||||
case 1:
|
||||
var res = await ConfigHelper.mapApi.GetMapRouteAreaDetailItem(Area.AreaId);
|
||||
UIManager.ShowNewRouteDetailPanel(res.data);
|
||||
break;
|
||||
case 2:
|
||||
Application.OpenURL(Area.Url);
|
||||
break;
|
||||
case 3:
|
||||
App.RouteIdParam = Area.RouteId;
|
||||
App.CompetionId = Area.CompetitionId;
|
||||
SceneManager.LoadScene("Ride");
|
||||
break;
|
||||
default:break;
|
||||
}
|
||||
}
|
||||
}
|
||||
11
Assets/RecommendController.cs.meta
Normal file
11
Assets/RecommendController.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a5392f3b322c5db44b83c6fbf233e58c
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Resources/Images/NewDesign/Pop-ups_Close.png
Normal file
BIN
Assets/Resources/Images/NewDesign/Pop-ups_Close.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
128
Assets/Resources/Images/NewDesign/Pop-ups_Close.png.meta
Normal file
128
Assets/Resources/Images/NewDesign/Pop-ups_Close.png.meta
Normal file
@ -0,0 +1,128 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 01101db7c3b415541a8ad3f915338e2b
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: -1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
applyGammaDecoding: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 34 KiB |
File diff suppressed because it is too large
Load Diff
@ -74,6 +74,91 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1727136245252294857
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8898243461665947538}
|
||||
- component: {fileID: 5084461713280883621}
|
||||
- component: {fileID: 5333614914452872892}
|
||||
- component: {fileID: 4617885136784831890}
|
||||
m_Layer: 5
|
||||
m_Name: Avatar
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8898243461665947538
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1727136245252294857}
|
||||
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: 3712074358906072574}
|
||||
m_RootOrder: 0
|
||||
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: 0, y: 0}
|
||||
m_SizeDelta: {x: 16, y: 16}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &5084461713280883621
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1727136245252294857}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5333614914452872892
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1727136245252294857}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 0}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
--- !u!114 &4617885136784831890
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1727136245252294857}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
radius: 8
|
||||
--- !u!1 &2192866306238927730
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1393,6 +1478,7 @@ RectTransform:
|
||||
- {fileID: 5778423490206480944}
|
||||
- {fileID: 3790473409329199100}
|
||||
- {fileID: 330365734832415941}
|
||||
- {fileID: 3712074358906072574}
|
||||
m_Father: {fileID: 5526612272745412623}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -2350,6 +2436,130 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &6384885675572862542
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9167271656428906309}
|
||||
- component: {fileID: 6174515118689406559}
|
||||
- component: {fileID: 8018876112413953653}
|
||||
m_Layer: 5
|
||||
m_Name: Name
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9167271656428906309
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6384885675572862542}
|
||||
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: 3712074358906072574}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 10, y: 0}
|
||||
m_SizeDelta: {x: -20, y: 14}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6174515118689406559
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6384885675572862542}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8018876112413953653
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6384885675572862542}
|
||||
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: 8180b991008992c45b6bf1a979c7baca, type: 3}
|
||||
m_FontSize: 10
|
||||
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:
|
||||
--- !u!1 &6529889595496394922
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3712074358906072574}
|
||||
- component: {fileID: 7693168466575471527}
|
||||
m_Layer: 5
|
||||
m_Name: Create
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3712074358906072574
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6529889595496394922}
|
||||
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: 8898243461665947538}
|
||||
- {fileID: 9167271656428906309}
|
||||
m_Father: {fileID: 5526612272615142912}
|
||||
m_RootOrder: 10
|
||||
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: -127}
|
||||
m_SizeDelta: {x: -20, y: 16}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &7693168466575471527
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6529889595496394922}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &7092283009486588411
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2932,12 +3142,12 @@ PrefabInstance:
|
||||
- target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2957,12 +3167,12 @@ PrefabInstance:
|
||||
- target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2972,12 +3182,12 @@ PrefabInstance:
|
||||
- target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3142,12 +3352,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3157,12 +3367,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3222,12 +3432,12 @@ PrefabInstance:
|
||||
- target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3237,12 +3447,12 @@ PrefabInstance:
|
||||
- target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3297,12 +3507,12 @@ PrefabInstance:
|
||||
- target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3317,12 +3527,12 @@ PrefabInstance:
|
||||
- target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3337,12 +3547,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3372,12 +3582,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3387,7 +3597,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -2
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8719966614707449432, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3978,15 +4188,15 @@ PrefabInstance:
|
||||
- {fileID: 7793409217181307314, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
|
||||
- {fileID: 829206726517620079, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
|
||||
--- !u!224 &8210619403058349570 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6155413159602679681}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &8210619403058349571 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6155413159602679681}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &8210619403058349570 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6155413159602679681}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@ -1,5 +1,123 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &2237488373511828626
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2909894636121885848}
|
||||
- component: {fileID: 7032804054254598915}
|
||||
- component: {fileID: 2031666968301312389}
|
||||
- component: {fileID: 5051621884270887221}
|
||||
m_Layer: 5
|
||||
m_Name: BtnClose
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2909894636121885848
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2237488373511828626}
|
||||
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: 7004216017408824981}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 10, y: 0}
|
||||
m_SizeDelta: {x: 24, y: 24}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &7032804054254598915
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2237488373511828626}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2031666968301312389
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2237488373511828626}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 5781e63d9fc789b46b84410ccd0e994d, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &5051621884270887221
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2237488373511828626}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
|
||||
m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_PressedColor: {r: 0.078431375, g: 0.078431375, b: 0.09019608, a: 1}
|
||||
m_SelectedColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 2031666968301312389}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &7004216017039062762
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -34,7 +152,7 @@ RectTransform:
|
||||
- {fileID: 5371378630209180036}
|
||||
- {fileID: 5371378629127854476}
|
||||
m_Father: {fileID: 7004216017408824981}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -60,6 +178,7 @@ GameObject:
|
||||
- component: {fileID: 7004216017408824981}
|
||||
- component: {fileID: 7004216017408824983}
|
||||
- component: {fileID: 7004216017408824982}
|
||||
- component: {fileID: 288486095397590213}
|
||||
m_Layer: 5
|
||||
m_Name: Main
|
||||
m_TagString: Untagged
|
||||
@ -78,6 +197,7 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 2909894636121885848}
|
||||
- {fileID: 2898988518583278953}
|
||||
- {fileID: 7004216017039062763}
|
||||
m_Father: {fileID: 7004216018333768315}
|
||||
@ -125,6 +245,19 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &288486095397590213
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7004216017408824980}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
radius: 20
|
||||
--- !u!1 &7004216018333768314
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -249,8 +382,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: -100}
|
||||
m_SizeDelta: {x: -20.000008, y: 66}
|
||||
m_AnchoredPosition: {x: 0, y: -58}
|
||||
m_SizeDelta: {x: -20, y: 108}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &7004216018422812566
|
||||
CanvasRenderer:
|
||||
@ -292,7 +425,7 @@ MonoBehaviour:
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Challenge route from Potala Palace Challenge route from Potala Challenge
|
||||
m_Text:
|
||||
--- !u!114 &7004216018422812567
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -416,7 +549,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7004216018699567870
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -720,7 +853,7 @@ PrefabInstance:
|
||||
- target: {fileID: 5262667172184159172, guid: 9ebd76bc01e150a48953ce775ff5c93b,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5262667172184159172, guid: 9ebd76bc01e150a48953ce775ff5c93b,
|
||||
type: 3}
|
||||
|
||||
@ -205,6 +205,12 @@ namespace Assets.Scripts.Apis
|
||||
return result;
|
||||
}
|
||||
|
||||
public async Task<JsonResult<MapRouteAreaItem>> GetMapRouteAreaDetailItem(int id)
|
||||
{
|
||||
var result = await GetAsync<JsonResult<MapRouteAreaItem>>($"MapRouteArea/GetDetail?areaId={id}");
|
||||
return result;
|
||||
}
|
||||
|
||||
public async Task<JsonResult<List<MapMaxRanking>>> GetMaxRanking()
|
||||
{
|
||||
var result = await GetAsync<JsonResult<List<MapMaxRanking>>>($"Map/GetMaxRanking");
|
||||
|
||||
@ -139,6 +139,8 @@ namespace Assets.Scripts.Apis.Models
|
||||
/// </summary>
|
||||
public DateTime UpdateTime { get; set; }
|
||||
public bool IsFav { get; set; }
|
||||
public string CreateUserHead { get; set; }
|
||||
public string CreateUserName { get; set; }
|
||||
}
|
||||
|
||||
public class MapRouteAreaRouteList
|
||||
|
||||
@ -197,8 +197,8 @@ public static class App
|
||||
#else
|
||||
//Host = "http://pf.juze.pro/";
|
||||
//Host = "http://192.168.0.101:5087/";
|
||||
UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
|
||||
TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
|
||||
UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
|
||||
TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
|
||||
#endif
|
||||
if (!FB.IsInitialized)
|
||||
{
|
||||
|
||||
@ -62,7 +62,7 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
|
||||
});
|
||||
UIManager.AddEvent(transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Google").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
Utils.CallAndroidMethod("signInWithGoogle");
|
||||
//Utils.CallAndroidMethod("signInWithGoogle");
|
||||
});
|
||||
//App.weChatController.Init(App.WxAppId);
|
||||
//var s = App.weChatController.isApplicationAvilible("com.gugoumainapp","powerfun").ToString();
|
||||
|
||||
@ -86,7 +86,7 @@ public class MainController : BaseScene
|
||||
msgs = List<CanvasGroup> { msg, msg2, msg3 };
|
||||
rightMessage = transform.Find("GameObject/MessageRight").GetComponent<CanvasGroup>();
|
||||
#else
|
||||
msgLocation = new Vector3(168, 37-80, 0);
|
||||
msgLocation = new Vector3(168, 37-46, 0);
|
||||
var go = transform.Find("GameObject");
|
||||
go.GetComponent<RectTransform>().anchorMin = Vector2.zero;
|
||||
go.GetComponent<RectTransform>().anchorMax = Vector2.one;
|
||||
@ -102,7 +102,7 @@ public class MainController : BaseScene
|
||||
rightMessage.transform.localPosition = 1 * msgLocation;
|
||||
rightMessage.alpha = 0;
|
||||
msgs = new List<CanvasGroup> { rightMessage };
|
||||
for (int i = 0; i < 3; i++)
|
||||
for (int i = 0; i < 4; i++)
|
||||
{
|
||||
var tmpm = Instantiate<CanvasGroup>(rightMessage);
|
||||
tmpm.transform.SetParent(rightMessage.transform.parent);
|
||||
@ -172,9 +172,9 @@ public class MainController : BaseScene
|
||||
}
|
||||
private void DoMessage6(LinkedMessageEvent e)
|
||||
{
|
||||
var selectIndex = msgIndex % 4;
|
||||
var selectIndex = msgIndex % 5;
|
||||
var m = msgs[selectIndex];
|
||||
if (msgIndex >= 4) //
|
||||
if (msgIndex >= 5) //
|
||||
{
|
||||
//msgIndex = 0;
|
||||
Sequence se = DOTween.Sequence();
|
||||
@ -417,7 +417,7 @@ public class MainController : BaseScene
|
||||
if (item.Point != null && item.Point.Length > 0 && item.Point[0] == -1d)
|
||||
{
|
||||
var message = lang == "zh" ? $"{item.Name}进入了 运动地球" : "entered PowerFun";
|
||||
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.Id}{item.LastActiveTime}{item.Point}");
|
||||
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(-1, message, item.HeadImage, item.Name, item.RouteName), $"{item.Id}{item.LastActiveTime}{item.Point}");
|
||||
}
|
||||
if (item.RouteId > 0)
|
||||
{
|
||||
|
||||
@ -398,14 +398,14 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
|
||||
protected override void Cancel(BaseEventData baseEvent)
|
||||
{
|
||||
if (App.MainSceneParam.ContainsKey("Name"))
|
||||
{
|
||||
App.MainSceneParam["Name"] = "RaceHomePanel";
|
||||
}
|
||||
else
|
||||
{
|
||||
App.MainSceneParam.Add("Name", "RaceHomePanel");
|
||||
}
|
||||
//if (App.MainSceneParam.ContainsKey("Name"))
|
||||
//{
|
||||
// App.MainSceneParam["Name"] = "RaceHomePanel";
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// App.MainSceneParam.Add("Name", "RaceHomePanel");
|
||||
//}
|
||||
base.Cancel(baseEvent);
|
||||
}
|
||||
#endregion
|
||||
|
||||
@ -223,7 +223,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
this.gameObject.SetActive(false);
|
||||
this.Destroy();
|
||||
SceneManager.LoadScene("MainScene");
|
||||
App.MainSceneParam["Name"] = "RaceHomePanel";
|
||||
//App.MainSceneParam["Name"] = "RaceHomePanel";
|
||||
}
|
||||
|
||||
private void OpenShare(BaseEventData baseEventData)
|
||||
|
||||
@ -220,14 +220,14 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
|
||||
protected override void StopRide(BaseEventData baseEventData)
|
||||
{
|
||||
if (!App.MainSceneParam.ContainsKey("Name"))
|
||||
{
|
||||
App.MainSceneParam.Add("Name", "RaceHomePanel");
|
||||
}
|
||||
else
|
||||
{
|
||||
App.MainSceneParam["Name"] = "RaceHomePanel";
|
||||
}
|
||||
//if (!App.MainSceneParam.ContainsKey("Name"))
|
||||
//{
|
||||
// App.MainSceneParam.Add("Name", "RaceHomePanel");
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// App.MainSceneParam["Name"] = "RaceHomePanel";
|
||||
//}
|
||||
if (mainController.isWatch)
|
||||
{
|
||||
UIManager.ShowConfirm("Quit", "Do you want to quit?", async () =>
|
||||
|
||||
@ -292,28 +292,69 @@ public class HomeController : PFUIPanel
|
||||
GetMaxRanking();
|
||||
maxt += 60f;
|
||||
}
|
||||
if (maxdataTime > 0)
|
||||
{
|
||||
maxdataTime -= Time.deltaTime;
|
||||
}
|
||||
else if (maxdataTime < 0)
|
||||
{
|
||||
DORotateMaxData();
|
||||
maxdataTime += 3;
|
||||
}
|
||||
}
|
||||
private async void GetMaxRanking()
|
||||
{
|
||||
var res = await ConfigHelper.mapApi.GetMaxRanking();
|
||||
if (res.result)
|
||||
{
|
||||
var list = res.data;
|
||||
if (list.Count >= 3)
|
||||
maxList = res.data;
|
||||
if (maxList.Count >= 3)
|
||||
{
|
||||
Transform p = transform.Find("MaxRankingData/Power"),
|
||||
d = transform.Find("MaxRankingData/Distance"),
|
||||
c = transform.Find("MaxRankingData/Climb");
|
||||
Utils.DisplayHead(p.Find("Avatar").GetComponent<RawImage>(), list[1].WxHeadImg);
|
||||
Utils.DisplayHead(d.Find("Avatar").GetComponent<RawImage>(), list[0].WxHeadImg);
|
||||
Utils.DisplayHead(c.Find("Avatar").GetComponent<RawImage>(), list[2].WxHeadImg);
|
||||
p.Find("NickName").GetComponent<Text>().text = list[1].NickName;
|
||||
d.Find("NickName").GetComponent<Text>().text = list[0].NickName;
|
||||
c.Find("NickName").GetComponent<Text>().text = list[2].NickName;
|
||||
maxdataTime = 3;
|
||||
maxdataIndex = 0;
|
||||
SetMessage(maxList[maxdataIndex++]);
|
||||
//Transform p = transform.Find("MaxRankingData/Power"),
|
||||
//d = transform.Find("MaxRankingData/Distance"),
|
||||
//c = transform.Find("MaxRankingData/Climb");
|
||||
//Utils.DisplayHead(p.Find("Avatar").GetComponent<RawImage>(), list[1].WxHeadImg);
|
||||
//Utils.DisplayHead(d.Find("Avatar").GetComponent<RawImage>(), list[0].WxHeadImg);
|
||||
//Utils.DisplayHead(c.Find("Avatar").GetComponent<RawImage>(), list[2].WxHeadImg);
|
||||
//p.Find("NickName").GetComponent<Text>().text = list[1].NickName;
|
||||
//d.Find("NickName").GetComponent<Text>().text = list[0].NickName;
|
||||
//c.Find("NickName").GetComponent<Text>().text = list[2].NickName;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
int maxdataIndex = 0;
|
||||
float maxdataTime = 0;
|
||||
private List<MapMaxRanking> maxList;
|
||||
|
||||
private void DORotateMaxData()
|
||||
{
|
||||
var t = transform.Find("MaxRankingData");
|
||||
var se = DOTween.Sequence();
|
||||
var s1 = t.DORotate(new Vector3(-90, 0, 0), 0.5f);
|
||||
s1.onComplete = () =>
|
||||
{
|
||||
SetMessage(maxList[(maxdataIndex++) % maxList.Count]);
|
||||
};
|
||||
se.Append(s1);
|
||||
se.Append(t.DORotate(Vector3.zero, 0.5f));
|
||||
}
|
||||
void SetMessage(MapMaxRanking e)
|
||||
{
|
||||
var m = transform.Find("MaxRankingData");
|
||||
Utils.DisplayHead(m.transform.Find("Avatar").GetComponent<RawImage>(), e.WxHeadImg);
|
||||
m.transform.Find("Nickname").GetComponent<Text>().text = e.NickName;
|
||||
var txt = m.transform.Find("TextContainer/Content").GetComponent<RectTransform>();
|
||||
txt.GetComponent<Text>().text = e.Message;
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate(txt);
|
||||
m.GetComponent<HomeMessageController>().Initial();
|
||||
m.GetComponent<HomeMessageController>().textWidth = txt.sizeDelta.x;
|
||||
}
|
||||
|
||||
public override void Show()
|
||||
{
|
||||
base.Show();
|
||||
|
||||
@ -187,6 +187,7 @@ public class NewRouteDetailController : PFUIPanel
|
||||
Debug.Log(153 + area.IsFav.ToString());
|
||||
|
||||
left.Find("Name").GetComponent<Text>().text = area.Name;
|
||||
|
||||
GetData();
|
||||
GetList();
|
||||
|
||||
@ -255,6 +256,8 @@ public class NewRouteDetailController : PFUIPanel
|
||||
.text = $"{res.data.AverageGrade.ToString("#0.00")}%";
|
||||
transform.Find("Container/Left/DescScroll/Viewport/Content/Desc").GetComponent<Text>()
|
||||
.text = res.data.Description;
|
||||
Utils.DisplayImageTempDict(transform.Find("Container/Left/Create/Avatar").GetComponent<RawImage>(), res.data.CreateUserHead, caches);
|
||||
transform.Find("Container/Left/Create/Name").GetComponent<Text>().text = res.data.CreateUserName;
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate(transform.Find("Container/Left/DescScroll").GetComponent<ScrollRect>().content);
|
||||
transform.Find("Container/Left/Fav").GetComponent<Image>().sprite = FavDict[res.data.IsFav];
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate(transform.Find("Container/Left/RideContainer").GetComponent<RectTransform>());
|
||||
|
||||
@ -48,7 +48,15 @@ public class RaceButtonGroupScript : MonoBehaviour
|
||||
}
|
||||
void GoEnter()
|
||||
{
|
||||
App.RouteIdParam = map.RouteId;
|
||||
if (App.MainSceneParam.ContainsKey("Name"))
|
||||
{
|
||||
App.MainSceneParam["Name"] = "RaceHomePanel";
|
||||
}
|
||||
else
|
||||
{
|
||||
App.MainSceneParam.Add("Name", "RaceHomePanel");
|
||||
}
|
||||
App.RouteIdParam = map.RouteId;
|
||||
App.CompetionId = map.Id;
|
||||
SceneManager.LoadScene("Ride");
|
||||
}
|
||||
@ -66,6 +74,14 @@ public class RaceButtonGroupScript : MonoBehaviour
|
||||
}
|
||||
void GoWatch()
|
||||
{
|
||||
if (App.MainSceneParam.ContainsKey("Name"))
|
||||
{
|
||||
App.MainSceneParam["Name"] = "RaceHomePanel";
|
||||
}
|
||||
else
|
||||
{
|
||||
App.MainSceneParam.Add("Name", "RaceHomePanel");
|
||||
}
|
||||
App.RouteIdParam = map.RouteId;
|
||||
App.CompetionId = map.Id;
|
||||
SceneManager.LoadScene("Ride");
|
||||
|
||||
@ -4,6 +4,7 @@ using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class StartRideModal : PFUIPanel
|
||||
{
|
||||
@ -13,6 +14,10 @@ public class StartRideModal : PFUIPanel
|
||||
private void Awake()
|
||||
{
|
||||
caches = new Dictionary<string, Texture>();
|
||||
UIManager.AddEvent(transform.Find("Main/BtnClose").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
Close();
|
||||
});
|
||||
UIManager.AddEvent(transform.Find("Main/Right/BtnClose").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
Close();
|
||||
@ -37,5 +42,6 @@ public class StartRideModal : PFUIPanel
|
||||
{
|
||||
this.map = map;
|
||||
transform.Find("Main/MapItem-Mobile").GetComponent<MapItem>().Initial(map,caches);
|
||||
transform.Find("Main/Right/S2").GetComponent<Text>().text = App.GetLocalLanguage() == "zh" ? $"<color=#fff>是否要加入</color><color=#f93086>{map.Name}</color><color=#fff>骑行？</color>" : $"<color=#fff>Join</color> <color=#f93086>{map.Name}</color><color=#fff>?</color>";
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user