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

Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo

Browse Source
This commit is contained in:
lishuo committed 2021-07-27 19:34:44 +08:00
2 parents 0eb399be9a ca938ab6f5
commit cfcb302a31
16 files changed
+1608 -51
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Resources/UI/Prefab/Panel/DownloadWorkoutsModal.prefab
+1307
View File
File diff suppressed because it is too large. Load diff
Assets/Resources/UI/Prefab/Panel/DownloadWorkoutsModal.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a70dccad18e97dd46b2b739e228989cc
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/UI/Prefab/Panel/RaceHomePanel.prefab
+13
View File
@@ -332,6 +332,7 @@ GameObject:
- component: {fileID: 3445340291243714514}
- component: {fileID: 3445340291243714524}
- component: {fileID: 3340209317336321644}
- component: {fileID: 2919480864831927539}
m_Layer: 5
m_Name: RaceHomePanel
m_TagString: Untagged
@@ -382,6 +383,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 93263b6a2a269ae4fb052ec2c022251c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!225 &2919480864831927539
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3445340291243714513}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &4573235035984813200
GameObject:
m_ObjectHideFlags: 0
Assets/Resources/UI/Prefab/Panel/RaceListPanel.prefab
+14 -1
View File
@@ -673,7 +673,7 @@ RectTransform:
m_GameObject: {fileID: 1372050265900358655}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.5779092, y: 1.5779092, z: 1.5779092}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 71653441858533815}
- {fileID: 71653441061169207}
@@ -812,6 +812,7 @@ GameObject:
- component: {fileID: 1673965681348374004}
- component: {fileID: 1673965681348374010}
- component: {fileID: 3032364714008089124}
- component: {fileID: 7732217181960295751}
m_Layer: 5
m_Name: RaceListPanel
m_TagString: Untagged
@@ -862,6 +863,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 82b3faa60bd657241a826920f2d8ad14, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!225 &7732217181960295751
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1673965681348374007}
m_Enabled: 1
m_Alpha: 0
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &2363214934641726875
GameObject:
m_ObjectHideFlags: 0