Commit 18a01e1c authored by zxhljwl's avatar zxhljwl

修改

parent c0bdc53d
...@@ -6758,7 +6758,7 @@ RectTransform: ...@@ -6758,7 +6758,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -257} m_AnchoredPosition: {x: 0, y: -266}
m_SizeDelta: {x: 464, y: 58.400818} m_SizeDelta: {x: 464, y: 58.400818}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &326292426 --- !u!114 &326292426
...@@ -9155,7 +9155,7 @@ RectTransform: ...@@ -9155,7 +9155,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 355} m_AnchoredPosition: {x: 0, y: 364}
m_SizeDelta: {x: 627, y: 128} m_SizeDelta: {x: 627, y: 128}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &399832639 --- !u!114 &399832639
...@@ -12788,7 +12788,7 @@ RectTransform: ...@@ -12788,7 +12788,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 323, y: 327} m_AnchoredPosition: {x: 323, y: 333}
m_SizeDelta: {x: 71, y: 73} m_SizeDelta: {x: 71, y: 73}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &577365250 --- !u!114 &577365250
...@@ -13911,7 +13911,7 @@ GameObject: ...@@ -13911,7 +13911,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &608070800 --- !u!224 &608070800
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -22128,7 +22128,7 @@ RectTransform: ...@@ -22128,7 +22128,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 720, y: 653} m_SizeDelta: {x: 721, y: 714}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &984387229 --- !u!114 &984387229
MonoBehaviour: MonoBehaviour:
...@@ -22149,7 +22149,7 @@ MonoBehaviour: ...@@ -22149,7 +22149,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8629157f97fc4db4f9160d29b783836a, type: 3} m_Sprite: {fileID: 21300000, guid: 758c629285ff1c94cb60efb1720ce65c, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
...@@ -24081,7 +24081,7 @@ PrefabInstance: ...@@ -24081,7 +24081,7 @@ PrefabInstance:
- target: {fileID: 2853166085728200632, guid: 1053be02c113a7a45adf322c929b0cb6, - target: {fileID: 2853166085728200632, guid: 1053be02c113a7a45adf322c929b0cb6,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2853166085728200634, guid: 1053be02c113a7a45adf322c929b0cb6, - target: {fileID: 2853166085728200634, guid: 1053be02c113a7a45adf322c929b0cb6,
type: 3} type: 3}
...@@ -26229,7 +26229,7 @@ RectTransform: ...@@ -26229,7 +26229,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -174} m_AnchoredPosition: {x: 0, y: -162}
m_SizeDelta: {x: 543, y: 135} m_SizeDelta: {x: 543, y: 135}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1203470291 --- !u!114 &1203470291
...@@ -38543,7 +38543,7 @@ GameObject: ...@@ -38543,7 +38543,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &1818874221 --- !u!224 &1818874221
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -38563,7 +38563,7 @@ RectTransform: ...@@ -38563,7 +38563,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 55} m_AnchoredPosition: {x: 0, y: 85}
m_SizeDelta: {x: 112, y: 142} m_SizeDelta: {x: 112, y: 142}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1818874222 --- !u!114 &1818874222
...@@ -40018,7 +40018,7 @@ GameObject: ...@@ -40018,7 +40018,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &1869528321 --- !u!224 &1869528321
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -40035,7 +40035,7 @@ RectTransform: ...@@ -40035,7 +40035,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 30} m_AnchoredPosition: {x: 0, y: 63}
m_SizeDelta: {x: 146, y: 185} m_SizeDelta: {x: 146, y: 185}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1869528322 --- !u!114 &1869528322
...@@ -29,24 +29,24 @@ public class WxLoginUtil : MonoBehaviour ...@@ -29,24 +29,24 @@ public class WxLoginUtil : MonoBehaviour
public void ShowWxLoginPage(Action<bool> wxLoginCallBack) public void ShowWxLoginPage(Action<bool> wxLoginCallBack)
{ {
////直接打包 ////直接打包
callBack = wxLoginCallBack; //callBack = wxLoginCallBack;
DeviceLogin(); //DeviceLogin();
//Android打包 //Android打包
//Token为null 没有登录 //Token为null 没有登录
//if (PrefenceUtils.GetInstance().getToken().Equals("")) if (PrefenceUtils.GetInstance().getToken().Equals(""))
//{ {
// EventUtils.OnEvent("login_show"); EventUtils.OnEvent("login_show");
// callBack = wxLoginCallBack; callBack = wxLoginCallBack;
// wxLoginBg.SetActive(true); wxLoginBg.SetActive(true);
//} }
//else else
//{ {
// wxLoginBg.SetActive(false); wxLoginBg.SetActive(false);
// wxLoginCallBack(true); wxLoginCallBack(true);
//} }
} }
public void ShowWxLoginPage() public void ShowWxLoginPage()
{ {
callBack = null; callBack = null;
......
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