lishuo/powerfun-unity
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

一些细节修改

Browse Source
This commit is contained in:
CaiYanPeng 2021-07-23 15:04:29 +08:00
parent 1c2afb4125
commit ae3f9d2101
16 changed files with 812 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/RaceButtonGroupScript.cs
View File

@ -7,6 +7,7 @@ public class RaceButtonGroupScript : MonoBehaviour
{
private Transform BtnEnter, BtnCancel, BtnWatch;
public MapCompetition map { get; set; }
public Transform parent { get; set; }
// Start is called before the first frame update
void Start()
{
@ -28,11 +29,18 @@ public class RaceButtonGroupScript : MonoBehaviour
}
void GoEnter()
{
if (!map.HasJoin)
{
parent.GetComponent<RaceItemScript>().Join();
}
Debug.Log(map);
}
void GoCancel()
{
Debug.Log("Cancel");
if (map.HasJoin)
{
parent.GetComponent<RaceItemScript>().CancelJoin();
}
}
void GoWatch()
{

31
Assets/RaceHomeScript.cs
View File

@ -12,7 +12,7 @@ public class RaceHomeScript : RaceScript
{
// Start is called before the first frame update
private ScrollRect scroll;
private Transform content,rightContainer,leftContainer,btnGoList;
private Transform content,rightContainer,leftContainer,btnGoList,avatar;
private float contentSize;
private int count;
private Button L, R;
@ -55,12 +55,22 @@ public class RaceHomeScript : RaceScript
{
UIManager.ShowRaceListPanel();
});
var r = await ConfigHelper.mapCompetitionApi.GetCompetitionListV2("", 0, 6);
DisplayMaps(r.data);
avatar = transform.Find("Avatar");
if (avatar != null)
{
Utils.DisplayImage(avatar.GetComponent<RawImage>(), App.CurrentUser.WxHeadImg, true);
UIManager.AddEvent(avatar.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
UIManager.ShowUserInfoPanel();
});
}
var r = await ConfigHelper.mapCompetitionApi.GetCompetitionListV2("", 0, 5);
var activityList = await ConfigHelper.mapCompetitionApi.GetCompetitionListV2("", 0, 3, activity: 1);
DisplayMaps(r.data,activityList.data);
Initial();
}
private void DisplayMaps(List<MapCompetition> list)
private void DisplayMaps(List<MapCompetition> list, List<MapCompetition> activityList)
{
int i = 0;
GameObject bigGame = Resources.Load<GameObject>("UI/Prefab/Race/ItemBig"),
@ -83,9 +93,15 @@ public class RaceHomeScript : RaceScript
}
for (i = 0; i < 3; i++)
{
var activity = activityList[i];
var banner = Instantiate<GameObject>(bannerItem);
var dot = Instantiate<GameObject>(dotItem);
Utils.DisplayImage(banner.GetComponent<RawImage>(), list[i].CoverImage, true);
Utils.DisplayImage(banner.GetComponent<RawImage>(), activity.BannerPreview, true);
UIManager.AddEvent(banner.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
OnBannerClick(activity);
});
banner.transform.SetParent(scroll.content);
dot.GetComponent<Image>().color =
i == 0 ? Utils.HexToColorHtml("#f93086") : Utils.HexToColorHtml("#ffffff");
@ -96,7 +112,10 @@ public class RaceHomeScript : RaceScript
}
rightContainer.Find("Container-2/BtnGoList").SetAsLastSibling();
}
void OnBannerClick(MapCompetition map)
{
Debug.Log("banner點擊");
}
private async Task Login()
{
var result = await ConfigHelper.userApi.Login("13115011550", "laozhong", "");

74
Assets/RaceItemScript.cs
View File

@ -42,6 +42,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
transform.Find("InfoContainer/DataContainer/Slope/Text").GetComponent<Text>().text
= $"{mapCompetition.AverageGrade.ToString("#0.00")}%";
transform.Find("InfoContainer/DataContainer/StartTime/Text").GetComponent<Text>().text = mapCompetition.StartTime.ToString();
transform.Find("CountContainer/Text").GetComponent<Text>().text = mapCompetition.ApplyCount.ToString();
SetStatus(mapCompetition);
SetButtonGroup(mapCompetition);
this.parent = parent;
@ -50,12 +51,13 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
private void SetButtonGroup(MapCompetition mapCompetition)
{
if (mapCompetition.Status == 1 || mapCompetition.Status == 3)
if (mapCompetition.Status == 1 || mapCompetition.Status == 3 || (mapCompetition.Status == 2 && !mapCompetition.HasJoin))
{
var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Enter");
var igame = Instantiate(game);
igame.name = "BtnContainer";
igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
igame.GetComponent<RaceButtonGroupScript>().parent = transform;
igame.transform.SetParent(transform);
igame.transform.localScale = Vector3.one;
var loc = Vector3.zero;
@ -68,6 +70,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
var igame = Instantiate(game);
igame.name = "BtnContainer";
igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
igame.GetComponent<RaceButtonGroupScript>().parent = transform;
igame.transform.SetParent(transform);
igame.transform.localScale = Vector3.one;
var loc = Vector3.zero;
@ -82,6 +85,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
var igame = Instantiate(game);
igame.name = "BtnContainer";
igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
igame.GetComponent<RaceButtonGroupScript>().parent = transform;
igame.transform.SetParent(transform);
igame.transform.localScale = Vector3.one;
var loc = Vector3.zero;
@ -94,6 +98,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
var igame = Instantiate(game);
igame.name = "BtnContainer";
igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
igame.GetComponent<RaceButtonGroupScript>().parent = transform;
igame.transform.SetParent(transform);
igame.transform.localScale = Vector3.one;
var loc = Vector3.zero;
@ -114,13 +119,17 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
{
status.gameObject.SetActive(false);
}
else
else
{
status.GetComponent<RawImage>().color = Utils.HexToColorHtml(statusColorDict[mapCompetition.Status]);
status.Find("Text").GetComponent<Text>().text = mapCompetition.StatusVlaue;
//status.gameObject.AddComponent<ImageWithIndependentRoundedCorners>();
//status.GetComponent<ImageWithIndependentRoundedCorners>().r.w = 20;
//status.GetComponent<ImageWithIndependentRoundedCorners>().r.y = 20;
if (mapCompetition.Status == 2 && mapCompetition.HasJoin)
{
status.Find("Text").GetComponent<Text>().text = "Applied";
}
else
{
status.Find("Text").GetComponent<Text>().text = mapCompetition.StatusVlaue;
}
}
}
@ -136,10 +145,13 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
transform.Find("InfoContainer").GetComponent<Image>().DOFade(1, 0.5f);
if (myType == ItemType.small)
{
transform.Find("InfoContainer/DataContainer").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
transform.Find("InfoContainer/AltitudeCurve").DOScaleY(1f, 0.5f);
transform.Find("InfoContainer").DOLocalMoveY(-225, 0.3f);
}
else
{
transform.Find("InfoContainer/Line").GetComponent<Image>().DOFade(1,0.5f);
transform.Find("InfoContainer").DOLocalMoveY(-246, 0.3f);
}
if (this.parent != null)
@ -160,10 +172,14 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
transform.Find("InfoContainer").GetComponent<Image>().DOFade(0, 0.5f);
if (myType == ItemType.small)
{
transform.Find("InfoContainer").DOLocalMoveY(-139, 0.3f);
transform.Find("InfoContainer/DataContainer").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
transform.Find("InfoContainer/AltitudeCurve").DOScaleY(1.7f, 0.5f);
transform.Find("InfoContainer").DOLocalMoveY(-124 + 50, 0.3f);
//transform.Find("InfoContainer").DOLocalMoveY(-139, 0.3f);
}
else
{
transform.Find("InfoContainer/Line").GetComponent<Image>().DOFade(0, 0.5f);
transform.Find("InfoContainer").DOLocalMoveY(-155, 0.3f);
}
if (this.parent != null)
@ -178,4 +194,48 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
}
/*
//先报名
if (_canJoin)
{
MapCompetitionApi s = new MapCompetitionApi();
var rrr = s.ApplyMapCompetition(cyclingController.competitionId);
if (rrr.Result.result)
{
var competition = s.GetById(cyclingController.competitionId).data;
_canStart = competition.CanStart;
}
rideNowText.text = "RideNow";
}
else
{
base.StartRide(baseEvent);
}
*/
async public void Join()
{
var res = await ConfigHelper.mapCompetitionApi.ApplyMapCompetition(mapCompetition.Id);
if (res.result)
{
mapCompetition.HasJoin = true;
transform.Find("CountContainer/Text").GetComponent<Text>().text = (++mapCompetition.ApplyCount).ToString();
SetStatus(mapCompetition);
transform.Find("BtnContainer").gameObject.Destroy();
SetButtonGroup(mapCompetition);
Utils.showToast(null, "Successful application!", type: 1);
}
}
async public void CancelJoin()
{
var res = await ConfigHelper.mapCompetitionApi.CancelMapCompetition(mapCompetition.Id);
if (res.result)
{
mapCompetition.HasJoin = false;
transform.Find("CountContainer/Text").GetComponent<Text>().text = (--mapCompetition.ApplyCount).ToString();
SetStatus(mapCompetition);
transform.Find("BtnContainer").gameObject.Destroy();
SetButtonGroup(mapCompetition);
Utils.showToast(null, "Successful cancellation application!", type: 1);
}
}
}

12
Assets/RaceListScript.cs
View File

@ -13,7 +13,7 @@ public class RaceListScript : RaceScript
{
// Start is called before the first frame update
private GameObject scroll;
private Transform content,statusOptionContainer, reserveContainer,dirContainer, searchInput,btnReturn;
private Transform content,statusOptionContainer, reserveContainer,dirContainer, searchInput,btnReturn,avatar;
private bool startMouse = false,isEnd = false;
private int pageIndex = 0, pageSize = 24;
private string raceName = "";
@ -111,6 +111,15 @@ public class RaceListScript : RaceScript
UIManager.ShowRaceHomePanel(true);
});
}
avatar = transform.Find("Avatar");
if (avatar != null)
{
Utils.DisplayImage(avatar.GetComponent<RawImage>(), App.CurrentUser.WxHeadImg, true);
UIManager.AddEvent(avatar.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
UIManager.ShowUserInfoPanel();
});
}
Refresh();
}
@ -125,6 +134,7 @@ public class RaceListScript : RaceScript
{
if (Input.GetAxis("Mouse ScrollWheel") != 0)
{
Debug.Log(scroll.GetComponent<ScrollRect>().verticalNormalizedPosition);
if (scroll.GetComponent<ScrollRect>().verticalNormalizedPosition <= 0 ||
scroll.GetComponent<ScrollRect>().verticalNormalizedPosition >= (pageIndex == 0 ? 1.2 : 1))
{

8
Assets/RaceScript.cs
View File

@ -25,6 +25,14 @@ public class RaceScript : PFUIPanel
{
currentItem = t;
HandleTime();
if (t != null)
{
StartTime();
}
else
{
StopTime();
}
}
/*参考代码
var second = Math.Ceiling((Now - mapCompetition.StartTime.ToLocalTime()).TotalSeconds);

BIN
Assets/Resources/Images/Race/back up.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.2 KiB

116
Assets/Resources/Images/Race/back up.png.meta Normal file
View File

@ -0,0 +1,116 @@
fileFormatVersion: 2
guid: b1a128c79ec0db74c86340aa03ae7006
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: 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:

86
Assets/Resources/UI/Prefab/Panel/RaceHomePanel.prefab
View File

@ -1,5 +1,90 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2322805962556808324
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 888596503449396189}
- component: {fileID: 1919275101020861157}
- component: {fileID: 3857366533915561099}
- component: {fileID: 7619259582365341040}
m_Layer: 5
m_Name: Avatar
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &888596503449396189
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2322805962556808324}
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: 3445340291243714514}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -60, y: -30}
m_SizeDelta: {x: 64, y: 64}
m_Pivot: {x: 1, y: 1}
--- !u!222 &1919275101020861157
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2322805962556808324}
m_CullTransparentMesh: 0
--- !u!114 &3857366533915561099
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2322805962556808324}
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 &7619259582365341040
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2322805962556808324}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 32
--- !u!1 &3340209316991978979
GameObject:
m_ObjectHideFlags: 0
@ -268,6 +353,7 @@ RectTransform:
- {fileID: 9215991904159477866}
- {fileID: 9215991903109907487}
- {fileID: 8089048072454713059}
- {fileID: 888596503449396189}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

600
Assets/Resources/UI/Prefab/Panel/RaceListPanel.prefab
View File

@ -725,6 +725,7 @@ RectTransform:
m_Children:
- {fileID: 4605362255460975187}
- {fileID: 8322632618302902071}
- {fileID: 5443913270778593719}
m_Father: {fileID: 4408462524766711656}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -763,7 +764,7 @@ MonoBehaviour:
m_ScrollSensitivity: 50
m_Viewport: {fileID: 4605362255460975187}
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 4995230873168002437}
m_HorizontalScrollbarVisibility: 2
m_VerticalScrollbarVisibility: 2
m_HorizontalScrollbarSpacing: -3
@ -832,6 +833,7 @@ RectTransform:
- {fileID: 4408462524766711656}
- {fileID: 7118448401530350836}
- {fileID: 7825229638776794366}
- {fileID: 3808910954941481150}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1470,7 +1472,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
@ -1575,7 +1577,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Padding:
m_Left: 20
m_Right: 20
m_Right: 0
m_Top: 20
m_Bottom: 0
m_ChildAlignment: 0
@ -1812,6 +1814,91 @@ MonoBehaviour:
m_EditorClassIdentifier:
r: {x: 30, y: 30, z: 0, w: 0}
rect2props: {x: -0.000015258789, y: -15, z: -81.67084, w: -81.67084}
--- !u!1 &4876623757515401105
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3808910954941481150}
- component: {fileID: 7538218140977774808}
- component: {fileID: 3391370300267073661}
- component: {fileID: 9149308215282111426}
m_Layer: 5
m_Name: Avatar
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3808910954941481150
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4876623757515401105}
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: 1673965681348374004}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -60, y: -30}
m_SizeDelta: {x: 64, y: 64}
m_Pivot: {x: 1, y: 1}
--- !u!222 &7538218140977774808
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4876623757515401105}
m_CullTransparentMesh: 0
--- !u!114 &3391370300267073661
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4876623757515401105}
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 &9149308215282111426
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4876623757515401105}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 32
--- !u!1 &5299950768805647023
GameObject:
m_ObjectHideFlags: 0
@ -1931,6 +2018,130 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &5636707158863814618
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5443913270778593719}
- component: {fileID: 6208840624193956598}
- component: {fileID: 5649820887468360938}
- component: {fileID: 4995230873168002437}
m_Layer: 5
m_Name: Scrollbar Vertical
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5443913270778593719
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5636707158863814618}
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: 7610893494027721197}
m_Father: {fileID: 1584307428038433354}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 0}
m_Pivot: {x: 1, y: 1}
--- !u!222 &6208840624193956598
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5636707158863814618}
m_CullTransparentMesh: 0
--- !u!114 &5649820887468360938
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5636707158863814618}
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: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
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 &4995230873168002437
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5636707158863814618}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 4040347187581518494}
m_HandleRect: {fileID: 1515387878974708611}
m_Direction: 2
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!1 &5948476992245059236
GameObject:
m_ObjectHideFlags: 0
@ -2066,6 +2277,80 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &5957950172520614784
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1515387878974708611}
- component: {fileID: 1879090066066017084}
- component: {fileID: 4040347187581518494}
m_Layer: 5
m_Name: Handle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1515387878974708611
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5957950172520614784}
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: 7610893494027721197}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1879090066066017084
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5957950172520614784}
m_CullTransparentMesh: 0
--- !u!114 &4040347187581518494
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5957950172520614784}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
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!1 &6795705504714217666
GameObject:
m_ObjectHideFlags: 0
@ -2466,6 +2751,160 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7550427320849319888}
m_CullTransparentMesh: 0
--- !u!1 &7622538158514482902
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7610893494027721197}
m_Layer: 5
m_Name: Sliding Area
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7610893494027721197
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7622538158514482902}
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: 1515387878974708611}
m_Father: {fileID: 5443913270778593719}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7825229638776794367
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7825229638776794366}
- component: {fileID: 7196181606344597827}
- component: {fileID: 7825229638776794365}
- component: {fileID: 5160179401433559677}
m_Layer: 5
m_Name: BtnReturn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7825229638776794366
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7825229638776794367}
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: 1673965681348374004}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 242, y: -40}
m_SizeDelta: {x: 44, y: 44}
m_Pivot: {x: 0, y: 1}
--- !u!114 &7196181606344597827
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7825229638776794367}
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: b1a128c79ec0db74c86340aa03ae7006, 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 &7825229638776794365
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7825229638776794367}
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: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 7196181606344597827}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!222 &5160179401433559677
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7825229638776794367}
m_CullTransparentMesh: 0
--- !u!1001 &3089084281570681624
PrefabInstance:
m_ObjectHideFlags: 0
@ -2907,158 +3346,3 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 5067779267173090679}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5125604185649825374
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1673965681348374004}
m_Modifications:
- target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Pivot.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_SizeDelta.x
value: 160
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_SizeDelta.y
value: 30
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 140
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -118
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Name
value: BtnReturn
objectReference: {fileID: 0}
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: Return
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}
--- !u!224 &7825229638776794366 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
m_PrefabInstance: {fileID: 5125604185649825374}
m_PrefabAsset: {fileID: 0}

6
Assets/Resources/UI/Prefab/Race/ButtonGroup/BtnContainer-Double-H.prefab
View File

@ -15,7 +15,7 @@ GameObject:
- component: {fileID: 6669779065912890166}
- component: {fileID: 5939340897533846330}
m_Layer: 5
m_Name: BtnContainer-Enter-Double-H
m_Name: BtnContainer-Double-H
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -238,7 +238,7 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: ENTER
value: Cancel Reserve
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -398,7 +398,7 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: ENTER
value: Enter
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}

6
Assets/Resources/UI/Prefab/Race/ButtonGroup/BtnContainer-Double-V.prefab
View File

@ -15,7 +15,7 @@ GameObject:
- component: {fileID: 7484985137738386844}
- component: {fileID: 2292962562348707660}
m_Layer: 5
m_Name: BtnContainer-Enter-Double-V
m_Name: BtnContainer-Double-V
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -238,7 +238,7 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: ENTER
value: Cancel Reserve
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -398,7 +398,7 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: ENTER
value: Enter
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}

2
Assets/Resources/UI/Prefab/Race/ButtonGroup/BtnContainer-Enter.prefab
View File

@ -196,7 +196,7 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: ENTER
value: Enter
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}

4
Assets/Resources/UI/Prefab/Race/ItemBig.prefab
View File

@ -586,7 +586,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -1779,7 +1779,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:

35
Assets/Resources/UI/Prefab/Race/ItemSmall.prefab
View File

@ -1015,11 +1015,11 @@ RectTransform:
m_Father: {fileID: 5521075339293163152}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 10}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -50}
m_SizeDelta: {x: 160, y: 20}
m_Pivot: {x: 0.5, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &5521075338908913117
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1041,7 +1041,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -1216,6 +1216,7 @@ GameObject:
m_Component:
- component: {fileID: 5521075339206499433}
- component: {fileID: 5521075339206499438}
- component: {fileID: 4457422455414081224}
m_Layer: 5
m_Name: DataContainer
m_TagString: Untagged
@ -1254,6 +1255,18 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5521075339206499432}
m_CullTransparentMesh: 0
--- !u!225 &4457422455414081224
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5521075339206499432}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &5521075339239291838
GameObject:
m_ObjectHideFlags: 0
@ -1975,11 +1988,11 @@ RectTransform:
m_Father: {fileID: 5521075338391914460}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 103}
m_SizeDelta: {x: 150, y: 44.513306}
m_Pivot: {x: 0.5, y: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -160}
m_SizeDelta: {x: 150, y: 39}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &8884367422075164971
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1996,7 +2009,7 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9142377267268215345}
m_Enabled: 1
m_Alpha: 0
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0

13
Assets/Scripts/Apis/MapCompetitionApi.cs
View File

@ -60,9 +60,9 @@ namespace Assets.Scripts.Apis
data = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MapCompetitionModel>>(JsonConvert.SerializeObject(list.data))
};
}
public async Task<JsonResult<List<MapCompetition>>> GetCompetitionListV2(string name, int pageIndex, int pageSize, string status = "", int order = 1, bool self = false)
public async Task<JsonResult<List<MapCompetition>>> GetCompetitionListV2(string name, int pageIndex, int pageSize, string status = "", int order = 1, bool self = false, int activity = 0)
{
var list = await GetAsync<JsonResult<dynamic>>($"/MapCompetition/v2/GetList?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&status={ status }&order={order}&self={self}");
var list = await GetAsync<JsonResult<dynamic>>($"/MapCompetition/v2/GetList?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&status={ status }&order={order}&self={self}&activity={activity}");
return new JsonResult<List<MapCompetition>>
{
result = list.result,
@ -91,5 +91,14 @@ namespace Assets.Scripts.Apis
};
return await PostAsync<JsonResult>($"/MapCompetition/ApplyMapCompetition", param);
}
//取消报名比赛
public async Task<JsonResult> CancelMapCompetition(int id)
{
var param = new
{
id = id,
};
return await PostAsync<JsonResult>($"/MapCompetition/CancelMapCompetition", param);
}
}
}

4
Assets/Scripts/Apis/Models/MapCompetition.cs
View File

@ -63,6 +63,10 @@ namespace Assets.Scripts.Apis.Models
public double MaxElevation { get; set; }
public string AltitudeGraph { get; set; }
public string RouteCover { get; set; }
public string SponsorCoverage { get; set; }
public string BannerPreview { get; set; }
public bool HasJoin { get; set; }
public int ApplyCount { get; set; }
}
public class CompetitionPlayer
{