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-29 20:01:52 +08:00
2 parents 9ab8165630 7884e7ac7e
commit 1919370a23
10 files changed
+99 -58
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab
+2 -2
View File
@@ -102,7 +102,7 @@ MonoBehaviour:
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 3714912750620550917}
m_HorizontalScrollbarVisibility: 0
m_VerticalScrollbarVisibility: 0
m_VerticalScrollbarVisibility: 1
m_HorizontalScrollbarSpacing: -3
m_VerticalScrollbarSpacing: -3
m_OnValueChanged:
@@ -5610,7 +5610,7 @@ PrefabInstance:
- target: {fileID: 7204820797918493515, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_Text
value: Route name
value: Route Name
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
Assets/Resources/UI/Prefab/Panel/RaceHomePanel.prefab
+17 -17
View File
@@ -480,6 +480,7 @@ GameObject:
- component: {fileID: 4573235035984813206}
- component: {fileID: 4573235035984813204}
- component: {fileID: 3611089692291679606}
- component: {fileID: 6137341165496780418}
m_Layer: 5
m_Name: BtnGoList
m_TagString: Untagged
@@ -583,6 +584,18 @@ MonoBehaviour:
m_GradientStyle: 0
m_ColorSpace: -1
m_IgnoreAspectRatio: 1
--- !u!114 &6137341165496780418
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4573235035984813200}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7f8a12a33aebf7b4cbfcd56590ec2016, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &4573235036014977500
GameObject:
m_ObjectHideFlags: 0
@@ -907,7 +920,6 @@ GameObject:
- component: {fileID: 3546599840402343035}
- component: {fileID: 4367154909318870032}
- component: {fileID: 6903105543186716152}
- component: {fileID: 2128218079967102783}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@@ -996,18 +1008,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!114 &2128218079967102783
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7337022735317176614}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7f8a12a33aebf7b4cbfcd56590ec2016, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &9215991903109907486
GameObject:
m_ObjectHideFlags: 0
@@ -1622,7 +1622,7 @@ PrefabInstance:
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 20
objectReference: {fileID: 0}
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
@@ -1787,7 +1787,7 @@ PrefabInstance:
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 20
objectReference: {fileID: 0}
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
@@ -1807,7 +1807,7 @@ PrefabInstance:
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 20
objectReference: {fileID: 0}
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
@@ -1827,7 +1827,7 @@ PrefabInstance:
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 20
objectReference: {fileID: 0}
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
Assets/Resources/UI/Prefab/Panel/RaceListPanel.prefab
+4 -4
View File
@@ -766,7 +766,7 @@ MonoBehaviour:
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 4995230873168002437}
m_HorizontalScrollbarVisibility: 2
m_VerticalScrollbarVisibility: 2
m_VerticalScrollbarVisibility: 1
m_HorizontalScrollbarSpacing: -3
m_VerticalScrollbarSpacing: -3
m_OnValueChanged:
@@ -1560,9 +1560,9 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: -3, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &4605362255460975190
CanvasRenderer:
@@ -3226,7 +3226,7 @@ PrefabInstance:
- target: {fileID: 7204820797918493515, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_Text
value: Race name
value: Race Name
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab
+11 -1
View File
@@ -5847,7 +5847,7 @@ PrefabInstance:
- target: {fileID: 523509238008881520, guid: ed226fe096f17a0459f856db5fc494af,
type: 3}
propertyPath: m_Text
value: Route name
value: Route Name
objectReference: {fileID: 0}
- target: {fileID: 1441145902436648424, guid: ed226fe096f17a0459f856db5fc494af,
type: 3}
@@ -5984,6 +5984,11 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7974311519597661725, guid: ed226fe096f17a0459f856db5fc494af,
type: 3}
propertyPath: m_VerticalScrollbarVisibility
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7974311519597661726, guid: ed226fe096f17a0459f856db5fc494af,
type: 3}
propertyPath: m_AnchorMax.y
@@ -6004,6 +6009,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7974311519881583202, guid: ed226fe096f17a0459f856db5fc494af,
type: 3}
propertyPath: m_VerticalScrollbarVisibility
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7974311519881583203, guid: ed226fe096f17a0459f856db5fc494af,
type: 3}
propertyPath: m_AnchorMax.y