Commit 48b234e1 authored by 王雪伟's avatar 王雪伟

我的花园换图

parent a05f4d78
......@@ -340,7 +340,7 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 455528767290619782}
m_Enabled: 1
m_Alpha: 1
m_Alpha: 0
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
......@@ -1979,7 +1979,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 9dd0e1dbcdde681429d4f4d3a2b81206, type: 3}
m_Sprite: {fileID: 21300000, guid: 6b8454e4afd554842af5e7109dd3d69d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......
......@@ -557,7 +557,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -42.2, y: 6.3}
m_SizeDelta: {x: 31, y: 40}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4313061084517032497
CanvasRenderer:
......
fileFormatVersion: 2
guid: e5841ca3d16f5450292c2328c1c9fb28
guid: 56065ab2d8c88404cb1f89c9793ab315
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
......
......@@ -28239,7 +28239,7 @@ PrefabInstance:
- target: {fileID: 2853166085728200632, guid: 1053be02c113a7a45adf322c929b0cb6,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2853166085728200634, guid: 1053be02c113a7a45adf322c929b0cb6,
type: 3}
......@@ -50055,7 +50055,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: c0738ae041fca4ff18b9a53b1425d3e6, type: 3}
m_Sprite: {fileID: 21300000, guid: 7e0bd0f803b544eba8617e9ae4be3612, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -54806,7 +54806,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u591A\u591A\u83DC\u56ED"
m_Text: "\u5E78\u798F\u82B1\u56ED"
--- !u!222 &2059799537
CanvasRenderer:
m_ObjectHideFlags: 0
......@@ -30,23 +30,23 @@ public class WxLoginUtil : MonoBehaviour
{
////直接打包
//callBack = wxLoginCallBack;
//DeviceLogin();
callBack = wxLoginCallBack;
DeviceLogin();
//Android打包
//Token为null 没有登录
if (PrefenceUtils.GetInstance().getToken().Equals(""))
{
EventUtils.OnEvent("login_show");
callBack = wxLoginCallBack;
wxLoginBg.SetActive(true);
loadingImg.SetActive(false);
}
else
{
wxLoginBg.SetActive(false);
wxLoginCallBack(true);
}
//if (PrefenceUtils.GetInstance().getToken().Equals(""))
//{
// EventUtils.OnEvent("login_show");
// callBack = wxLoginCallBack;
// wxLoginBg.SetActive(true);
// loadingImg.SetActive(false);
//}
//else
//{
// wxLoginBg.SetActive(false);
// wxLoginCallBack(true);
//}
}
public void ShowWxLoginPage()
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment