修改nav;增加消息弹窗
This commit is contained in:
parent
2d38b63c91
commit
f5385e31d6
Binary file not shown.
@ -14,6 +14,7 @@ dependencies {
|
||||
implementation ('com.mapbox.maps:android:10.2.0-beta.1'){
|
||||
exclude group: 'group_name', module: 'module_name'
|
||||
}
|
||||
implementation 'com.google.android.gms:play-services-auth:20.0.0'
|
||||
}
|
||||
|
||||
android {
|
||||
|
||||
@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
radius: 16
|
||||
radius: 22
|
||||
--- !u!1 &2638424933752433026
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -64,7 +64,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 52, y: 0}
|
||||
m_SizeDelta: {x: 64, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2638424933752433029
|
||||
CanvasRenderer:
|
||||
@ -251,12 +251,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -486,12 +486,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -688,12 +688,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -868,12 +868,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -1054,12 +1054,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -1255,12 +1255,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -1471,12 +1471,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -1662,12 +1662,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -1843,12 +1843,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -2028,12 +2028,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -2214,12 +2214,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -2415,12 +2415,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 32
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
|
||||
@ -7446,12 +7446,12 @@ PrefabInstance:
|
||||
- target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -7471,12 +7471,12 @@ PrefabInstance:
|
||||
- target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -7486,12 +7486,12 @@ PrefabInstance:
|
||||
- target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -7561,7 +7561,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 52
|
||||
value: 64
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -7656,12 +7656,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -7671,12 +7671,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -7736,12 +7736,12 @@ PrefabInstance:
|
||||
- target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -7751,12 +7751,12 @@ PrefabInstance:
|
||||
- target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -7811,12 +7811,12 @@ PrefabInstance:
|
||||
- target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -7831,12 +7831,12 @@ PrefabInstance:
|
||||
- target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -7856,12 +7856,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -7891,12 +7891,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -7906,7 +7906,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8719966614707449432, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
|
||||
@ -681,6 +681,7 @@ RectTransform:
|
||||
- {fileID: 4077563585998376547}
|
||||
- {fileID: 7944455583227005010}
|
||||
- {fileID: 990678332190591730}
|
||||
- {fileID: 9134628867012962}
|
||||
m_Father: {fileID: 465239219729653177}
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -6263,6 +6264,80 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -20, y: -20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &7606814329391234922
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9134628867012962}
|
||||
- component: {fileID: 7714849623991552188}
|
||||
- component: {fileID: 2751269119906778110}
|
||||
m_Layer: 5
|
||||
m_Name: Return
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9134628867012962
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7606814329391234922}
|
||||
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: 1429559311419137021}
|
||||
m_RootOrder: 13
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 22, y: 40}
|
||||
m_SizeDelta: {x: 44, y: 44}
|
||||
m_Pivot: {x: 1, y: 0}
|
||||
--- !u!222 &7714849623991552188
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7606814329391234922}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2751269119906778110
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7606814329391234922}
|
||||
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: fdb6d865c6f1a0d45a6fa4e26e4784a8, 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!1 &7749477167361371665
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -7537,7 +7612,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 52
|
||||
value: 64
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -8096,33 +8171,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3}
|
||||
--- !u!1 &6398833330297696636 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &5779092891361109961 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &8149286171844735752 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &3075247155673026290 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4628129972378993927 stripped
|
||||
--- !u!1 &5779092891361109961 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@ -8150,6 +8207,24 @@ GameObject:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6398833330297696636 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &8149286171844735752 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4628129972378993927 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &6073211655158443556
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -8299,9 +8374,27 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3}
|
||||
--- !u!224 &185106026378206774 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
--- !u!1 &6423651778393776433 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6216688916544654740 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &3745822250017908288 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4998415483215112909 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@ -8323,9 +8416,9 @@ GameObject:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6216688916544654740 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
--- !u!224 &185106026378206774 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@ -8335,24 +8428,6 @@ GameObject:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &3745822250017908288 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6423651778393776433 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4998415483215112909 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &6653062728498872177
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -8517,15 +8592,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
||||
--- !u!224 &7944455583227005010 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6653062728498872177}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4976321847170018841 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6653062728498872177}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &7944455583227005010 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6653062728498872177}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@ -2932,12 +2932,12 @@ PrefabInstance:
|
||||
- target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2957,12 +2957,12 @@ PrefabInstance:
|
||||
- target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2972,12 +2972,12 @@ PrefabInstance:
|
||||
- target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3047,7 +3047,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 52
|
||||
value: 64
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3142,12 +3142,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3157,12 +3157,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3222,12 +3222,12 @@ PrefabInstance:
|
||||
- target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3237,12 +3237,12 @@ PrefabInstance:
|
||||
- target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3297,12 +3297,12 @@ PrefabInstance:
|
||||
- target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3317,12 +3317,12 @@ PrefabInstance:
|
||||
- target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3337,12 +3337,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3372,12 +3372,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3387,7 +3387,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8719966614707449432, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
|
||||
@ -2288,12 +2288,12 @@ PrefabInstance:
|
||||
- target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2313,12 +2313,12 @@ PrefabInstance:
|
||||
- target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2328,12 +2328,12 @@ PrefabInstance:
|
||||
- target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2403,7 +2403,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 52
|
||||
value: 64
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2498,12 +2498,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2513,12 +2513,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2578,12 +2578,12 @@ PrefabInstance:
|
||||
- target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2593,12 +2593,12 @@ PrefabInstance:
|
||||
- target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2653,12 +2653,12 @@ PrefabInstance:
|
||||
- target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2673,12 +2673,12 @@ PrefabInstance:
|
||||
- target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2693,12 +2693,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2728,12 +2728,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -2743,7 +2743,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8719966614707449432, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
|
||||
@ -635,6 +635,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 93263b6a2a269ae4fb052ec2c022251c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
newNav: {fileID: 0}
|
||||
--- !u!225 &2919480864831927539
|
||||
CanvasGroup:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2053,7 +2054,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 52
|
||||
value: 64
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
|
||||
@ -1106,6 +1106,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 82b3faa60bd657241a826920f2d8ad14, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
newNav: {fileID: 0}
|
||||
--- !u!225 &7732217181960295751
|
||||
CanvasGroup:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3802,12 +3803,12 @@ PrefabInstance:
|
||||
- target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3827,12 +3828,12 @@ PrefabInstance:
|
||||
- target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3842,12 +3843,12 @@ PrefabInstance:
|
||||
- target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -3917,7 +3918,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 52
|
||||
value: 64
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -4012,12 +4013,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -4027,12 +4028,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -4092,12 +4093,12 @@ PrefabInstance:
|
||||
- target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -4107,12 +4108,12 @@ PrefabInstance:
|
||||
- target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -4167,12 +4168,12 @@ PrefabInstance:
|
||||
- target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -4187,12 +4188,12 @@ PrefabInstance:
|
||||
- target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -4207,12 +4208,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -4242,12 +4243,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
@ -4257,7 +4258,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8719966614707449432, guid: 240a4465e4dc90848a0efc1a9520c658,
|
||||
type: 3}
|
||||
|
||||
1052
Assets/Resources/UI/Prefab/Panel/Mobile/StartRideModal.prefab
Normal file
1052
Assets/Resources/UI/Prefab/Panel/Mobile/StartRideModal.prefab
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: edc776247d121174886c75e616e948a7
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -306,7 +306,8 @@
|
||||
"PERFECT INFORMATION": "完善信息",
|
||||
"Distance King": "里程王",
|
||||
"Power King": "功率王",
|
||||
"Climbing King": "爬坡王"
|
||||
"Climbing King": "爬坡王",
|
||||
"WAIT": "稍等"
|
||||
},
|
||||
"en": {
|
||||
"HOT ROUTES": "HOT ROUTES",
|
||||
@ -607,6 +608,7 @@
|
||||
"PERFECT INFORMATION": "PERFECT INFORMATION",
|
||||
"Distance King": "Distance King",
|
||||
"Power King": "Power King",
|
||||
"Climbing King": "Climbing King"
|
||||
"Climbing King": "Climbing King",
|
||||
"WAIT": "WAIT"
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -19,7 +19,7 @@ public delegate void ChangeLanguageDelegate();
|
||||
|
||||
public static class App
|
||||
{
|
||||
public static string Host = "http://192.168.0.101:5083/";
|
||||
public static string Host = "http://192.168.0.101:5085/";
|
||||
|
||||
public static string AppVersion = Application.version;
|
||||
|
||||
@ -193,7 +193,7 @@ public static class App
|
||||
//Host = "http://192.168.0.101:5085/";
|
||||
//UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000);
|
||||
//TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
|
||||
Debug.unityLogger.logEnabled = false;
|
||||
//Debug.unityLogger.logEnabled = false;
|
||||
#else
|
||||
//Host = "http://pf.juze.pro/";
|
||||
//Host = "http://192.168.0.101:5087/";
|
||||
|
||||
@ -60,6 +60,10 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
|
||||
FB.LogOut();
|
||||
FB.LogInWithReadPermissions(callback: onFaceBookResp);
|
||||
});
|
||||
UIManager.AddEvent(transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Google").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
Utils.CallAndroidMethod("signInWithGoogle");
|
||||
});
|
||||
//App.weChatController.Init(App.WxAppId);
|
||||
//var s = App.weChatController.isApplicationAvilible("com.gugoumainapp","powerfun").ToString();
|
||||
//Utils.showToast(null, SystemInfo.batteryLevel.ToString());
|
||||
@ -190,6 +194,19 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
|
||||
}
|
||||
}
|
||||
|
||||
public void OnMobileGoogleLoginResp(string res)
|
||||
{
|
||||
Utils.showToast(null, res);
|
||||
//if (res.Contains("true;"))
|
||||
//{
|
||||
// GetComponent<LoginController>().goWxLoginWithCode(res.Replace("true;", ""), "mobile");
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// Utils.showToast(null, res.Replace("false;", ""));
|
||||
//}
|
||||
}
|
||||
|
||||
public void OnAppleResp(string res)
|
||||
{
|
||||
#if UNITY_IOS
|
||||
|
||||
@ -269,11 +269,16 @@ public class MainController : BaseScene
|
||||
{
|
||||
if (e.routeId > 0)
|
||||
{
|
||||
UIManager.ShowConfirm(App.GetLocalString("RIDE NOW"), App.GetLocalLanguage() == "zh"? $"<color=#fff>是否要加入</color><color=#f93086>{e.routeName}</color><color=#fff>骑行?</color>" :$"<color=#fff>Join</color> <color=#f93086>{e.routeName}</color><color=#fff>?</color>", () =>
|
||||
{
|
||||
App.RouteIdParam = e.routeId;
|
||||
SceneManager.LoadScene("Ride");
|
||||
});
|
||||
var res = ConfigHelper.mapApi.GetById(e.routeId);
|
||||
if (res.result)
|
||||
{
|
||||
UIManager.ShowStartRideModal(res.data);
|
||||
}
|
||||
//UIManager.ShowConfirm(App.GetLocalString("RIDE NOW"), App.GetLocalLanguage() == "zh"? $"<color=#fff>是否要加入</color><color=#f93086>{e.routeName}</color><color=#fff>骑行?</color>" :$"<color=#fff>Join</color> <color=#f93086>{e.routeName}</color><color=#fff>?</color>", () =>
|
||||
// {
|
||||
// App.RouteIdParam = e.routeId;
|
||||
// SceneManager.LoadScene("Ride");
|
||||
// });
|
||||
}
|
||||
//Debug.Log(e.routeId);
|
||||
});
|
||||
|
||||
@ -20,6 +20,7 @@ public class PropNames
|
||||
}
|
||||
public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,IPointerUpHandler
|
||||
{
|
||||
public bool isModal = false;
|
||||
float width;
|
||||
float height;
|
||||
void Awake()
|
||||
@ -88,8 +89,12 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
|
||||
// }
|
||||
// SceneManager.LoadScene("Ride");
|
||||
//});
|
||||
transform.GetComponent<Button>().onClick.RemoveAllListeners();
|
||||
transform.GetComponent<Button>().onClick.AddListener(Ride);
|
||||
if (!isModal)
|
||||
{
|
||||
transform.GetComponent<Button>().onClick.RemoveAllListeners();
|
||||
transform.GetComponent<Button>().onClick.AddListener(Ride);
|
||||
}
|
||||
|
||||
transform.Find("Name").GetComponent<Text>().text = myMap.Name;
|
||||
|
||||
transform.Find("IdContainer/Text").GetComponent<Text>().text = $"#{myMap.Id}";
|
||||
@ -106,8 +111,11 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
|
||||
diff.Find("Text").GetComponent<Text>().text = myMap.Hard;
|
||||
tabContainer.Find("3d").gameObject.SetActive(myMap.Enable3D);
|
||||
tabContainer.Find("Country").GetComponent<RawImage>().texture = UIManager.Instance.loginRegOptions.GetCountryImage(myMap.CountryCode);
|
||||
transform.Find("CollectImg").GetComponent<Button>().onClick.RemoveAllListeners();
|
||||
transform.Find("CollectImg").GetComponent<Button>().onClick.AddListener(Collect);
|
||||
if (!isModal)
|
||||
{
|
||||
transform.Find("CollectImg").GetComponent<Button>().onClick.RemoveAllListeners();
|
||||
transform.Find("CollectImg").GetComponent<Button>().onClick.AddListener(Collect);
|
||||
}
|
||||
transform.Find("CollectImg").Find("Image").GetComponent<Image>().sprite =
|
||||
UIManager.Instance.collectDict[myMap.IsFavorite];
|
||||
#if !(UNITY_ANDROID || UNITY_IOS)
|
||||
@ -121,7 +129,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
|
||||
|
||||
SetActive4Button(false);
|
||||
#if UNITY_ANDROID || UNITY_IOS
|
||||
var isRecent = App.CurrentRouteType == "Recent Routes" && myMap.RecentRecord != null && myMap.RecentRecord.ContinueCyclingParam != null;
|
||||
var isRecent = App.CurrentRouteType == "Recent Routes" && myMap.RecentRecord != null && myMap.RecentRecord.ContinueCyclingParam != null && !isModal;
|
||||
transform.Find("BtnContinue").gameObject.SetActive(isRecent);
|
||||
transform.Find("BtnReride").gameObject.SetActive(isRecent);
|
||||
transform.Find("MapHBImg").gameObject.SetActive(!isRecent);
|
||||
|
||||
@ -81,6 +81,7 @@ public class MapListController : PFUIPanel
|
||||
{
|
||||
topRect.sizeDelta = new Vector2(topRect.sizeDelta.x + 20, topRect.sizeDelta.y);
|
||||
}
|
||||
|
||||
var mc = transform.Find("MC");
|
||||
UIManager.AddEvent(transform.Find("SwitchMode/BtnFilter").gameObject, EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
@ -88,11 +89,7 @@ public class MapListController : PFUIPanel
|
||||
});
|
||||
UIManager.AddEvent(mc.gameObject, EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
topContainer.DOLocalMoveX(App.topRectStartX.Value, 0.3f);
|
||||
mc.GetComponent<CanvasGroup>().DOFade(0, 0.3f).onComplete = () =>
|
||||
{
|
||||
mc.gameObject.SetActive(false);
|
||||
};
|
||||
CloseFilter();
|
||||
});
|
||||
map = Resources.Load<GameObject>("UI/Prefab/MapList/MapItem-Mobile");
|
||||
Debug.Log(98);
|
||||
@ -286,9 +283,22 @@ public class MapListController : PFUIPanel
|
||||
}
|
||||
caches = new Dictionary<string, Texture>();
|
||||
}
|
||||
|
||||
public void CloseFilter()
|
||||
{
|
||||
var mc = transform.Find("MC");
|
||||
topContainer.Find("Return").gameObject.SetActive(false);
|
||||
topContainer.DOLocalMoveX(App.topRectStartX.Value, 0.3f);
|
||||
mc.GetComponent<CanvasGroup>().DOFade(0, 0.3f).onComplete = () =>
|
||||
{
|
||||
mc.gameObject.SetActive(false);
|
||||
};
|
||||
}
|
||||
|
||||
public void OpenFilter(bool isFocusSearch = true)
|
||||
{
|
||||
#if UNITY_ANDROID || UNITY_IOS
|
||||
topContainer.Find("Return").gameObject.SetActive(true);
|
||||
var topRect = transform.Find("Top").GetComponent<RectTransform>();
|
||||
if (!App.topRectStartX.HasValue)
|
||||
{
|
||||
@ -540,6 +550,7 @@ public class MapListController : PFUIPanel
|
||||
GetComponent<MapListExtraController>().HandleCollection();
|
||||
#if UNITY_ANDROID || UNITY_IOS
|
||||
ResetPage();
|
||||
transform.Find("Top/Return").gameObject.SetActive(false);
|
||||
#endif
|
||||
ResetPanel();
|
||||
transform.MyDOFade();
|
||||
|
||||
@ -31,9 +31,14 @@ public class MapListExtraController : PFUIPanel
|
||||
p2originx = p2.GetComponent<RectTransform>().localPosition.x;
|
||||
#if UNITY_ANDROID || UNITY_IOS
|
||||
tmpCollectItem = Resources.Load<Transform>("UI/Prefab/NewRoute/Mobile/RouteItem");
|
||||
UIManager.AddEvent(transform.Find("Top/Return").gameObject, EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
GetComponent<MapListController>().CloseFilter();
|
||||
});
|
||||
#else
|
||||
tmpCollectItem = Resources.Load<Transform>("UI/Prefab/NewRoute/RouteItem");
|
||||
#endif
|
||||
|
||||
UIManager.AddEvent(typeSelector.Find("Container/Route").gameObject, EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
typeSelector.Find("Container/Route").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
|
||||
|
||||
@ -383,6 +383,22 @@ public class UIManager : MonoBehaviour
|
||||
//UIManager.Show(UIManager.Instance.RaceListPanel, UIManager.Instance.MainPanel);
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region
|
||||
private StartRideModal mStartRideModal;
|
||||
public StartRideModal StartRideModalObj
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.GetPanelInstance("StartRideModal", ref this.mStartRideModal);
|
||||
}
|
||||
}
|
||||
public static void ShowStartRideModal(MapRoute map)
|
||||
{
|
||||
UIManager.Instance.StartRideModalObj.GetComponent<StartRideModal>().Initial(map);
|
||||
UIManager.Show(UIManager.Instance.StartRideModalObj, null, true);
|
||||
}
|
||||
#endregion
|
||||
private PFUIPanel mModalsPanel;
|
||||
public PFUIPanel ModalsPanel
|
||||
{
|
||||
|
||||
41
Assets/StartRideModal.cs
Normal file
41
Assets/StartRideModal.cs
Normal file
@ -0,0 +1,41 @@
|
||||
using Assets.Scripts.Apis.Models;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
|
||||
public class StartRideModal : PFUIPanel
|
||||
{
|
||||
private Dictionary<string, Texture> caches;
|
||||
MapRoute map;
|
||||
// Start is called before the first frame update
|
||||
private void Awake()
|
||||
{
|
||||
caches = new Dictionary<string, Texture>();
|
||||
UIManager.AddEvent(transform.Find("Main/Right/BtnClose").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
Close();
|
||||
});
|
||||
UIManager.AddEvent(transform.Find("Main/Right/BtnRide").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
if (map != null)
|
||||
{
|
||||
App.RouteIdParam = map.Id;
|
||||
SceneManager.LoadScene("Ride");
|
||||
}
|
||||
});
|
||||
}
|
||||
protected override void OnDestroy()
|
||||
{
|
||||
caches = null;
|
||||
Resources.UnloadUnusedAssets();
|
||||
GC.Collect();
|
||||
Debug.Log("list empty");
|
||||
}
|
||||
public void Initial(MapRoute map)
|
||||
{
|
||||
this.map = map;
|
||||
transform.Find("Main/MapItem-Mobile").GetComponent<MapItem>().Initial(map,caches);
|
||||
}
|
||||
}
|
||||
11
Assets/StartRideModal.cs.meta
Normal file
11
Assets/StartRideModal.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0ee9baffb8240654dbd650e0a32bf061
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -13,7 +13,7 @@
|
||||
</packages>
|
||||
<files />
|
||||
<settings>
|
||||
<setting name="androidAbis" value="arm64-v8a,armeabi-v7a" />
|
||||
<setting name="androidAbis" value="armeabi-v7a" />
|
||||
<setting name="bundleId" value="com.ZhiXingPai.PowerFunUnity" />
|
||||
<setting name="explodeAars" value="True" />
|
||||
<setting name="gradleBuildEnabled" value="True" />
|
||||
@ -22,7 +22,7 @@
|
||||
<setting name="packageDir" value="Assets/Plugins/Android" />
|
||||
<setting name="patchAndroidManifest" value="True" />
|
||||
<setting name="patchMainTemplateGradle" value="True" />
|
||||
<setting name="projectExportEnabled" value="True" />
|
||||
<setting name="projectExportEnabled" value="False" />
|
||||
<setting name="useJetifier" value="False" />
|
||||
</settings>
|
||||
</dependencies>
|
||||
@ -256,7 +256,7 @@ PlayerSettings:
|
||||
clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
|
||||
templatePackageId: com.unity.template.3d@4.2.8
|
||||
templateDefaultScene: Assets/Scenes/SampleScene.unity
|
||||
AndroidTargetArchitectures: 3
|
||||
AndroidTargetArchitectures: 1
|
||||
AndroidSplashScreenScale: 0
|
||||
androidSplashScreen: {fileID: 0}
|
||||
AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore'
|
||||
@ -868,7 +868,7 @@ PlayerSettings:
|
||||
platformArchitecture:
|
||||
iPhone: 1
|
||||
scriptingBackend:
|
||||
Android: 1
|
||||
Android: 0
|
||||
Standalone: 0
|
||||
il2cppCompilerConfiguration:
|
||||
Standalone: 0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user