暂存
This commit is contained in:
parent
723c881790
commit
f21b83697b
@ -66,6 +66,7 @@ public static class XCodePostProcessBuild
|
||||
wxArray.AddString("weixin");
|
||||
wxArray.AddString("wechat");
|
||||
wxArray.AddString("weixinULAPI");
|
||||
wxArray.AddString("powerfun");
|
||||
|
||||
PlistElementDict qxLoc = plist.root.CreateDict("NSLocationWhenInUseUsageDescription");
|
||||
qxLoc.SetBoolean("NSLocationWhenInUseUsageDescription", true);
|
||||
|
||||
Binary file not shown.
@ -86,4 +86,25 @@ void WechatLogin(const char* scope,const char* state)
|
||||
void OpenWXApp()
|
||||
{
|
||||
[WXApi openWXApp];
|
||||
}
|
||||
|
||||
bool checkAPPIsExist(NSString* URLScheme)
|
||||
{
|
||||
NSURL* url;
|
||||
if ([URLScheme containsString:@"://"])
|
||||
{
|
||||
url = [NSURL URLWithString:[NSString stringWithFormat:@"%@",URLScheme]];
|
||||
}
|
||||
else
|
||||
{
|
||||
url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://",URLScheme]];
|
||||
}
|
||||
if([[UIApplication sharedApplication] canOpenURL:url])
|
||||
{
|
||||
return YES;
|
||||
}
|
||||
else
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
}
|
||||
8
Assets/Resources/Mobile.meta
Normal file
8
Assets/Resources/Mobile.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f134d222725933a4a8aa79fee0ebc10c
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1686,7 +1686,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137258, a: 1}
|
||||
m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@ -1926,7 +1926,7 @@ MonoBehaviour:
|
||||
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 10
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_BestFit: 1
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
@ -2425,7 +2425,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137258, a: 1}
|
||||
m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@ -2983,7 +2983,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137258, a: 1}
|
||||
m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
|
||||
@ -187,7 +187,7 @@ MonoBehaviour:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 465239219729653178}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
|
||||
m_Name:
|
||||
|
||||
@ -1258,7 +1258,6 @@ GameObject:
|
||||
- component: {fileID: 3143990868080801561}
|
||||
- component: {fileID: 3143990868080801563}
|
||||
- component: {fileID: 3143990868080801562}
|
||||
- component: {fileID: 3143990868080801564}
|
||||
- component: {fileID: 3143990868080801556}
|
||||
m_Layer: 5
|
||||
m_Name: Button
|
||||
@ -1323,22 +1322,6 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &3143990868080801564
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3143990868080801560}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Inverse: 0
|
||||
m_MaskInteraction: 85
|
||||
m_UseStencil: 1
|
||||
m_RaycastFilter: 0
|
||||
--- !u!114 &3143990868080801556
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2409,13 +2392,13 @@ MonoBehaviour:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
|
||||
m_FontSize: 20
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 7
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
@ -2698,7 +2681,7 @@ MonoBehaviour:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
|
||||
m_FontSize: 20
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
|
||||
@ -36,8 +36,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -104}
|
||||
m_SizeDelta: {x: 0, y: 17}
|
||||
m_AnchoredPosition: {x: 0, y: -96}
|
||||
m_SizeDelta: {x: 0, y: 14}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &331225470839700675
|
||||
CanvasRenderer:
|
||||
@ -121,7 +121,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 17}
|
||||
m_SizeDelta: {x: 0, y: 14}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &331225470862433147
|
||||
CanvasRenderer:
|
||||
@ -152,12 +152,12 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 14
|
||||
m_FontSize: 10
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 0
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
@ -199,7 +199,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 17}
|
||||
m_SizeDelta: {x: 0, y: 14}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &331225471265440393
|
||||
CanvasRenderer:
|
||||
@ -230,12 +230,12 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 14
|
||||
m_FontSize: 10
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 0
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
@ -277,7 +277,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 17}
|
||||
m_SizeDelta: {x: 0, y: 14}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &331225471740520316
|
||||
CanvasRenderer:
|
||||
@ -308,12 +308,12 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 14
|
||||
m_FontSize: 10
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 0
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
@ -355,7 +355,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 17}
|
||||
m_SizeDelta: {x: 0, y: 14}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &331225471917455509
|
||||
CanvasRenderer:
|
||||
@ -386,12 +386,12 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 14
|
||||
m_FontSize: 10
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 0
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
@ -438,7 +438,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -81}
|
||||
m_SizeDelta: {x: 0, y: 17}
|
||||
m_SizeDelta: {x: 0, y: 14}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &331225472001556013
|
||||
CanvasRenderer:
|
||||
@ -497,6 +497,8 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 7596543225826370523}
|
||||
- component: {fileID: 1616657703676474664}
|
||||
- component: {fileID: 5743559341209434294}
|
||||
- component: {fileID: 9092179112494897981}
|
||||
m_Layer: 5
|
||||
m_Name: RightMatch
|
||||
m_TagString: Untagged
|
||||
@ -522,8 +524,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 482, y: 0}
|
||||
m_SizeDelta: {x: -964, y: 0}
|
||||
m_AnchoredPosition: {x: 278.5, y: 0}
|
||||
m_SizeDelta: {x: -557, y: -55}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1616657703676474664
|
||||
CanvasRenderer:
|
||||
@ -533,6 +535,45 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 394191259421430988}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5743559341209434294
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 394191259421430988}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!114 &9092179112494897981
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 394191259421430988}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 4
|
||||
m_Spacing: 5
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
--- !u!1 &3956325779266006875
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -565,11 +606,11 @@ RectTransform:
|
||||
m_Father: {fileID: 4516012623690469005}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -22}
|
||||
m_SizeDelta: {x: 0, y: 44}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 22}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3956325779266006878
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -599,10 +640,10 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 32
|
||||
m_FontSize: 16
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
@ -643,10 +684,10 @@ RectTransform:
|
||||
m_Father: {fileID: 4516012623690469005}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -58}
|
||||
m_SizeDelta: {x: 14, y: 19}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -36}
|
||||
m_SizeDelta: {x: 0, y: 14}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &3956325779691258937
|
||||
CanvasRenderer:
|
||||
@ -677,7 +718,7 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 14
|
||||
m_FontSize: 10
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 1
|
||||
@ -704,7 +745,7 @@ GameObject:
|
||||
- component: {fileID: 8165744897097518677}
|
||||
- component: {fileID: 6147895834536267412}
|
||||
m_Layer: 5
|
||||
m_Name: RouteItem
|
||||
m_Name: RouteItem-Mobile
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -731,7 +772,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1118, y: 140}
|
||||
m_SizeDelta: {x: 640, y: 120}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4085630360285719622
|
||||
CanvasRenderer:
|
||||
@ -874,8 +915,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 240, y: 0}
|
||||
m_SizeDelta: {x: 724, y: 140}
|
||||
m_AnchoredPosition: {x: 152, y: 0}
|
||||
m_SizeDelta: {x: 405, y: 120}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &4085630360693584945
|
||||
CanvasRenderer:
|
||||
@ -917,11 +958,11 @@ RectTransform:
|
||||
m_Father: {fileID: 4516012623829342350}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 563, y: 1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -70}
|
||||
m_SizeDelta: {x: 286, y: 1}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &4085630362103246103
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -993,8 +1034,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -15}
|
||||
m_SizeDelta: {x: 0, y: 22}
|
||||
m_AnchoredPosition: {x: 0, y: -10}
|
||||
m_SizeDelta: {x: 0, y: 34}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &4516012621968954542
|
||||
CanvasRenderer:
|
||||
@ -1025,7 +1066,7 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 16
|
||||
m_FontSize: 12
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 1
|
||||
@ -1033,7 +1074,7 @@ MonoBehaviour:
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Challenge route from Potala Palace to Everest Base Camp
|
||||
@ -1071,8 +1112,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -43}
|
||||
m_SizeDelta: {x: 0, y: 17}
|
||||
m_AnchoredPosition: {x: 0, y: -46}
|
||||
m_SizeDelta: {x: 0, y: 14}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &4516012623390820326
|
||||
CanvasRenderer:
|
||||
@ -1103,7 +1144,7 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 12
|
||||
m_FontSize: 10
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 1
|
||||
@ -1152,8 +1193,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 603, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_AnchoredPosition: {x: 316, y: 0}
|
||||
m_SizeDelta: {x: 68, y: 68}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &4516012623690469007
|
||||
CanvasRenderer:
|
||||
@ -1230,8 +1271,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 20, y: 0}
|
||||
m_SizeDelta: {x: 563, y: 140}
|
||||
m_AnchoredPosition: {x: 10, y: 0}
|
||||
m_SizeDelta: {x: 286, y: 120}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &4516012623829342351
|
||||
CanvasRenderer:
|
||||
@ -1276,7 +1317,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 17}
|
||||
m_SizeDelta: {x: 0, y: 14}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4798129127435135196
|
||||
CanvasRenderer:
|
||||
@ -1307,12 +1348,12 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 14
|
||||
m_FontSize: 10
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 0
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
@ -1329,6 +1370,8 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 5607096041038795515}
|
||||
- component: {fileID: 5607096041038795512}
|
||||
- component: {fileID: 1385334607627503544}
|
||||
- component: {fileID: 1020874047256454934}
|
||||
m_Layer: 5
|
||||
m_Name: Right
|
||||
m_TagString: Untagged
|
||||
@ -1355,8 +1398,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 482, y: 0}
|
||||
m_SizeDelta: {x: -964, y: 0}
|
||||
m_AnchoredPosition: {x: 278.5, y: 0}
|
||||
m_SizeDelta: {x: -557, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5607096041038795512
|
||||
CanvasRenderer:
|
||||
@ -1366,6 +1409,45 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5607096041038795514}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1385334607627503544
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5607096041038795514}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!114 &1020874047256454934
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5607096041038795514}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 4
|
||||
m_Spacing: 5
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
--- !u!1 &7437299638014193431
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1401,7 +1483,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_SizeDelta: {x: 68, y: 68}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7437299638014193428
|
||||
CanvasRenderer:
|
||||
@ -1476,7 +1558,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 240, y: 0}
|
||||
m_SizeDelta: {x: 152, y: 0}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &8504920722886678751
|
||||
CanvasRenderer:
|
||||
@ -1525,7 +1607,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
r: {x: 20, y: 0, z: 0, w: 20}
|
||||
rect2props: {x: 10.000015, y: 0, z: 127.27923, w: 127.27923}
|
||||
rect2props: {x: 10.000008, y: -0.0000076293945, z: 89.09546, w: 89.09546}
|
||||
--- !u!1 &8791382824283463304
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1630,7 +1712,7 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -1640,7 +1722,7 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -1650,7 +1732,7 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 114
|
||||
value: 43
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -1695,12 +1777,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 41.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -90
|
||||
value: -35
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -1805,27 +1887,27 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 114
|
||||
value: 43
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -1875,7 +1957,7 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -55
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -1980,27 +2062,27 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 114
|
||||
value: 43
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -2050,7 +2132,7 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -20
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -2155,27 +2237,27 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 114
|
||||
value: 43
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -2225,7 +2307,7 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -90
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -2330,7 +2412,7 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -2340,7 +2422,7 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -2350,7 +2432,7 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 114
|
||||
value: 43
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -2395,12 +2477,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 41.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -20
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -295,6 +295,7 @@ RectTransform:
|
||||
- {fileID: 730655536}
|
||||
- {fileID: 1985738406}
|
||||
- {fileID: 1378474436}
|
||||
- {fileID: 684809390}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -324,6 +325,84 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 273807000}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &313551262
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 313551263}
|
||||
- component: {fileID: 313551265}
|
||||
- component: {fileID: 313551264}
|
||||
m_Layer: 5
|
||||
m_Name: TimeText
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &313551263
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 313551262}
|
||||
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: 684809390}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -60, y: 0}
|
||||
m_SizeDelta: {x: 60, y: 30}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!114 &313551264
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 313551262}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 16
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
--- !u!222 &313551265
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 313551262}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &356010322
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -398,6 +477,52 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 356010322}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &684809389
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 684809390}
|
||||
- component: {fileID: 684809391}
|
||||
m_Layer: 5
|
||||
m_Name: MobileInfo
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &684809390
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 684809389}
|
||||
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: 1726804852}
|
||||
- {fileID: 313551263}
|
||||
m_Father: {fileID: 273807004}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &684809391
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 684809389}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &724627085
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -755,6 +880,84 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1600, y: 900}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1726804851
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1726804852}
|
||||
- component: {fileID: 1726804854}
|
||||
- component: {fileID: 1726804853}
|
||||
m_Layer: 5
|
||||
m_Name: BatteryText
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1726804852
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1726804851}
|
||||
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: 684809390}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 60, y: 30}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!114 &1726804853
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1726804851}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 16
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
--- !u!222 &1726804854
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1726804851}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &1962586925
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -11,6 +11,9 @@ public class LoginControllerMobile : MonoBehaviour
|
||||
// Start is called before the first frame update
|
||||
ScrollRect loginScrollView;
|
||||
Transform thirdLoginPage;
|
||||
|
||||
public WeChatController weChat { get; private set; }
|
||||
|
||||
void Awake()
|
||||
{
|
||||
loginScrollView = transform.Find("Panel/LoginContainer/LoginScrollView").GetComponent<ScrollRect>();
|
||||
@ -26,8 +29,19 @@ public class LoginControllerMobile : MonoBehaviour
|
||||
(b) => goWxLogin());
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void Start()
|
||||
{
|
||||
transform.Find("MobileInfo/BatteryText").GetComponent<Text>().text =
|
||||
$"{Math.Round(SystemInfo.batteryLevel * 100, 0)}%";
|
||||
transform.Find("MobileInfo/TimeText").GetComponent<Text>().text =
|
||||
DateTime.Now.ToString("HH:mm");
|
||||
weChat = App.weChatController;
|
||||
weChat.Init(App.WxAppId);
|
||||
//App.weChatController.Init(App.WxAppId);
|
||||
//var s = App.weChatController.isApplicationAvilible("com.gugoumainapp","powerfun").ToString();
|
||||
//Utils.showToast(null, SystemInfo.batteryLevel.ToString());
|
||||
}
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
@ -44,8 +58,6 @@ public class LoginControllerMobile : MonoBehaviour
|
||||
private void goWxLogin()
|
||||
{
|
||||
#if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS)
|
||||
var weChat = App.weChatController;
|
||||
weChat.Init(App.WxAppId);
|
||||
if (weChat.IsWeChatAppInstalled())
|
||||
{
|
||||
weChat.WxLogin("snsapi_userinfo", "");
|
||||
|
||||
@ -22,6 +22,8 @@ public class WeChatController
|
||||
|
||||
[DllImport("__Internal")]
|
||||
private static extern void WechatLogin(string scope,string state);
|
||||
[DllImport("__Internal")]
|
||||
private static extern bool checkAPPIsExist(string URLScheme);
|
||||
#endif
|
||||
#endregion
|
||||
/// <summary>
|
||||
@ -52,13 +54,12 @@ public class WeChatController
|
||||
public void Init(string APPID)
|
||||
{
|
||||
_APP_ID = APPID;
|
||||
#if !UNITY_EDITOR && UNITY_ANDROID
|
||||
#if UNITY_ANDROID
|
||||
mainActivityClass = new AndroidJavaClass(_className);
|
||||
// 第一个参数: MainActivity中的方法名
|
||||
// 第二、三个参数: 分别是SendMessageToUnity需要接收的第一和第二个参数,对比上面Java的代码
|
||||
mainActivityClass.CallStatic("InitWeChat", Application.identifier, _APP_ID);
|
||||
#endif
|
||||
#if !UNITY_EDITOR && UNITY_IOS
|
||||
#elif UNITY_IOS
|
||||
RegisterApp(_APP_ID);
|
||||
#endif
|
||||
}
|
||||
@ -77,12 +78,25 @@ public class WeChatController
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 分享链接至微信,缩略图用的是APP Icon
|
||||
/// </summary>
|
||||
/// <param name="scene">分享至什么场景, 0-对话、1-朋友圈、2-收藏</param>
|
||||
/// <param name="url">网页链接</param>
|
||||
/// <param name="title">标题</param>
|
||||
/// <param name="description">描述</param>
|
||||
/// 判断应用是否存在
|
||||
/// </summary>
|
||||
/// <param name="pkgName"></param>
|
||||
/// <returns></returns>
|
||||
public bool isApplicationAvilible(string pkgName,string URLScheme)
|
||||
{
|
||||
#if UNITY_ANDROID
|
||||
return mainActivityClass.CallStatic<bool>("isApplicationAvilible",pkgName);
|
||||
#elif UNITY_IOS
|
||||
return checkAPPIsExist(URLScheme);
|
||||
#endif
|
||||
}
|
||||
/// <summary>
|
||||
/// 分享链接至微信,缩略图用的是APP Icon
|
||||
/// </summary>
|
||||
/// <param name="scene">分享至什么场景, 0-对话、1-朋友圈、2-收藏</param>
|
||||
/// <param name="url">网页链接</param>
|
||||
/// <param name="title">标题</param>
|
||||
/// <param name="description">描述</param>
|
||||
public void ShareWebpageToWX(int scene, string url, string title, string description)
|
||||
{
|
||||
mainActivityClass.CallStatic("ShareWebpageToWX", scene, url, title, description);
|
||||
|
||||
@ -3,6 +3,7 @@ using Assets.Scripts.Devices.Ant;
|
||||
using Assets.Scripts.Scenes;
|
||||
using Assets.Scripts.UI.Prefab.Device;
|
||||
using Mapbox.Examples;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
@ -24,7 +25,7 @@ public class MainController : BaseScene
|
||||
#if UNITY_ANDROID || UNITY_IOS
|
||||
transform.GetComponent<CanvasScaler>().referenceResolution = new Vector2(844, 390);
|
||||
transform.Find("Panel").GetComponent<RectTransform>().sizeDelta = new Vector2(844, 390);
|
||||
transform.Find("ModalPanel").GetComponent<RectTransform>().sizeDelta = new Vector2(844, 390);
|
||||
//transform.Find("ModalPanel").GetComponent<RectTransform>().sizeDelta = new Vector2(844, 390);
|
||||
#endif
|
||||
App.MainDeviceAdapter.StartScan();
|
||||
}
|
||||
@ -35,6 +36,10 @@ public class MainController : BaseScene
|
||||
UIManager.Instance.Root = root;
|
||||
UIManager.Instance.MainPanel = this.transform.Find("Panel").GetComponent<PFUIPanel>();
|
||||
UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent<PFUIPanel>();
|
||||
transform.Find("MobileInfo/BatteryText").GetComponent<Text>().text =
|
||||
$"{Math.Round(SystemInfo.batteryLevel * 100, 0)}%";
|
||||
transform.Find("MobileInfo/TimeText").GetComponent<Text>().text =
|
||||
DateTime.Now.ToString("HH:mm");
|
||||
#if UNITY_EDITOR
|
||||
if (App.CurrentUser == null) //App.CurrentUser == null
|
||||
{
|
||||
|
||||
@ -7,6 +7,7 @@ using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.Events;
|
||||
using DG.Tweening;
|
||||
|
||||
namespace Assets.Scripts.UI.Control
|
||||
{
|
||||
@ -96,6 +97,10 @@ namespace Assets.Scripts.UI.Control
|
||||
public void SetValidate()
|
||||
{
|
||||
outline.enabled = true;
|
||||
outline.DOFade(1, 1f).onComplete = () =>
|
||||
{
|
||||
outline.DOFade(0, 1f);
|
||||
};
|
||||
}
|
||||
//public void SetValidate(string s)
|
||||
//{
|
||||
|
||||
@ -7,7 +7,7 @@ using UnityEngine;
|
||||
using UnityEngine.Events;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.UI;
|
||||
|
||||
using DG.Tweening;
|
||||
namespace Assets.Scripts.UI.Control
|
||||
{
|
||||
public class PFUIInputField: PFUIComponentBase
|
||||
@ -123,6 +123,10 @@ namespace Assets.Scripts.UI.Control
|
||||
if (value)
|
||||
{
|
||||
outline.enabled = true;
|
||||
outline.DOFade(1, 1f).onComplete = () =>
|
||||
{
|
||||
outline.DOFade(0, 1f);
|
||||
};
|
||||
outline.effectColor = Utils.HexToColorHtml("#F93086");
|
||||
ColorUtility.TryParseHtmlString("#F93086", out Color color);
|
||||
//this.mInnerInputField.transform.Find("Text").GetComponent<Text>().color = color;
|
||||
|
||||
@ -129,7 +129,14 @@ public class HomeController : PFUIPanel
|
||||
Application.Quit();
|
||||
});
|
||||
#else
|
||||
Application.OpenURL("powerfun://app");
|
||||
if (App.weChatController.isApplicationAvilible("com.zhixingpai.powerfun", "powerfun"))
|
||||
{
|
||||
Application.OpenURL("powerfun://app");
|
||||
}
|
||||
else
|
||||
{
|
||||
Application.OpenURL("http://www.powerfun.com/Download");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
//进入比赛
|
||||
|
||||
@ -29,6 +29,9 @@ public class ResultListController : PFUIPanel
|
||||
void Awake()
|
||||
{
|
||||
//ApiBase.SetCookie("73385F5F719B610D132C1ECF3E9143272BF15214D57ED91CD7A9DFD832407471535112AAEB8E9271F75D54FBBF2D99F18FA313C1EEA5676F5D722D7FBB07C926BEC5905591BF9AFDDC6336552DF273112C2DA1794E6FA2F465B11FECD2E82E52");
|
||||
#if UNITY_ANDROID || UNITY_IOS
|
||||
routeResult = Resources.Load<Transform>("UI/Prefab/ResultList/RouteItem-Mobile");
|
||||
#endif
|
||||
InitialColor();
|
||||
scroll = transform.Find("ListPanel").Find("Scroll").GetComponent<ScrollRect>();
|
||||
btnMatch = transform.Find("ListPanel").Find("BtnMatch");
|
||||
@ -283,7 +286,7 @@ public class ResultListController : PFUIPanel
|
||||
}
|
||||
scroll.transform.Find("Error").gameObject.SetActive(contents[scrollIndex].childCount == 0);
|
||||
}
|
||||
#region 主页面滑动逻辑
|
||||
#region 主页面滑动逻辑
|
||||
int scrollIndex = 0;
|
||||
bool startScroll = false;
|
||||
ScrollRect scroll;
|
||||
@ -296,7 +299,6 @@ public class ResultListController : PFUIPanel
|
||||
var value = index * scrollValue;
|
||||
if (scroll != null && startScroll)
|
||||
{
|
||||
#if (UNITY_ANDROID || UNITY_IOS)
|
||||
if (scroll.horizontalNormalizedPosition >= value)
|
||||
{
|
||||
scroll.horizontalNormalizedPosition -= (scrollValue / 20);
|
||||
@ -317,30 +319,6 @@ public class ResultListController : PFUIPanel
|
||||
startScroll = false;
|
||||
}
|
||||
}
|
||||
#else
|
||||
//if (scroll.verticalNormalizedPosition <= 1)
|
||||
//{
|
||||
// scroll.verticalNormalizedPosition =0;
|
||||
// Debug.Log($"{scroll.verticalNormalizedPosition},{scrollValue/20}");
|
||||
// if (scroll.verticalNormalizedPosition <= 0)
|
||||
// {
|
||||
// Debug.Log(index);
|
||||
// scroll.verticalNormalizedPosition = 0;
|
||||
// startScroll = false;
|
||||
// }
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// scroll.verticalNormalizedPosition += (scrollValue / 20);
|
||||
// Debug.Log($"反向:{scroll.verticalNormalizedPosition},{scrollValue / 20}");
|
||||
// if (scroll.verticalNormalizedPosition >= 1)
|
||||
// {
|
||||
// Debug.Log(index);
|
||||
// scroll.verticalNormalizedPosition = 1;
|
||||
// startScroll = false;
|
||||
// }
|
||||
//}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
@ -100,12 +100,12 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
|
||||
transform.Find("Right").gameObject.SetActive(false);
|
||||
}
|
||||
//right.gameObject.SetActive(true);
|
||||
#if !(UNITY_ANDROID || UNITY_IOS)
|
||||
gameObject.GetComponent<Button>().onClick.AddListener(() =>
|
||||
{
|
||||
Detail();
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
#endif
|
||||
}
|
||||
void Detail()
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user