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-04-27 15:15:59 +08:00
2 parents 4353a38c96 1002b0433a
commit 8226b8a7c2
206 files changed
+13484 -2849
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scenes/1-Login.unity
+2694 -2341
View File
File diff suppressed because it is too large. Load diff
Assets/Scenes/3-MapList.unity
+1 -127
View File
@@ -574,12 +574,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 48.593002, y: -4.8190002, z: -6.4140005}
--- !u!224 &1777885815771056282 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
m_PrefabInstance: {fileID: 6213525856824102203}
m_PrefabAsset: {fileID: 0}
--- !u!222 &5779676824772088946
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -598,8 +592,7 @@ RectTransform:
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: 1777885815771056282}
m_Children: []
m_Father: {fileID: 1678571401}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -625,122 +618,3 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1001 &6213525856824102203
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 5779676824772088956}
m_Modifications:
- target: {fileID: 1777885814862178516, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_Name
value: HomePanel
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1777885814862178517, guid: 8bb6a9e5107a46744ba70fc370774184,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8bb6a9e5107a46744ba70fc370774184, type: 3}