lishuo/powerfun-unity
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

微信登录接入；卡片点击效果

Browse Source
This commit is contained in:
CaiYanPeng 2021-09-13 17:33:58 +08:00
parent 51cea743be
commit 969835e4d7
20 changed files with 1558 additions and 1352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Assets/Plugins/Android/AndroidManifest.xml
View File

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<application android:requestLegacyExternalStorage="true">
<activity android:name="com.unityplugins.imageselector.TestMainActivity" android:theme="@style/UnityThemeSelector" android:screenOrientation="landscape" android:launchMode="singleTask" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection|density" android:hardwareAccelerated="false">
<activity android:name="com.unityplugins.imageselector.TestMainActivity"
android:theme="@style/UnityThemeSelector"
android:screenOrientation="landscape"
android:launchMode="singleTask" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection|density" android:hardwareAccelerated="false">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
@ -14,19 +17,9 @@
</intent-filter>
</activity>
<activity
android:name="com.unityplugins.imageselector.SelectActivity">
android:launchMode="singleInstance"
android:name="com.unityplugins.imageselector.SelectActivity">
</activity>
<!-- 模拟主项目中定义的其他FileProvider -->
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="${applicationId}.any_provider"
android:grantUriPermissions="true"
android:exported="false"
tools:replace="android:authorities">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths" />
</provider>
</application>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

BIN
Assets/Plugins/Android/ImageSelector-release.aar
View File

Binary file not shown.

BIN
Assets/Plugins/Android/UnityCallWechatShare-release.aar
View File

Binary file not shown.

BIN
Assets/Resources/Images/Mobile/卡片蒙版.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 63 KiB

128
Assets/Resources/Images/Mobile/卡片蒙版.png.meta Normal file
View File

@ -0,0 +1,128 @@
fileFormatVersion: 2
guid: a27b45d6a99f2744a98c957cfaea7599
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Resources/Mobile.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f134d222725933a4a8aa79fee0ebc10c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

40
Assets/Resources/UI/Prefab/MapList/MapItem-Mobile.prefab
View File

@ -187,7 +187,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5262667172184159172}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -346,7 +346,6 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7631758156335843687}
- {fileID: 6818617791399626994}
- {fileID: 7550522280433707764}
- {fileID: 6307032429101699376}
@ -359,6 +358,7 @@ RectTransform:
- {fileID: 5307116753344173197}
- {fileID: 5298406130298708889}
- {fileID: 7800446602652995690}
- {fileID: 7631758156335843687}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -460,7 +460,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5262667172184159172}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@ -538,7 +538,7 @@ RectTransform:
- {fileID: 5307116753827441526}
- {fileID: 5307116753824956015}
m_Father: {fileID: 5262667172184159172}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -964,7 +964,7 @@ RectTransform:
m_Children:
- {fileID: 8442301621206230725}
m_Father: {fileID: 5262667172184159172}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -1247,7 +1247,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5262667172184159172}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@ -1325,7 +1325,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5262667172184159172}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@ -1525,7 +1525,7 @@ RectTransform:
- {fileID: 5307116754629177247}
- {fileID: 5836440877148088560}
m_Father: {fileID: 5262667172184159172}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -1651,7 +1651,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5262667172184159172}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@ -1726,7 +1726,7 @@ RectTransform:
m_Children:
- {fileID: 281043391255508357}
m_Father: {fileID: 5262667172184159172}
m_RootOrder: 3
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}
@ -1787,7 +1787,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &7631758156335843687
RectTransform:
m_ObjectHideFlags: 0
@ -1800,12 +1800,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5262667172184159172}
m_RootOrder: 0
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 290, y: 295.39685}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &8471130078746586188
CanvasRenderer:
@ -1828,13 +1828,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 162c7773edbbef44f9daa08df1c776d7, type: 3}
m_Sprite: {fileID: 21300000, guid: a27b45d6a99f2744a98c957cfaea7599, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1875,7 +1875,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5262667172184159172}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -2188,7 +2188,7 @@ PrefabInstance:
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_RootOrder
value: 12
value: 11
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -2353,7 +2353,7 @@ PrefabInstance:
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_RootOrder
value: 11
value: 10
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}

30
Assets/Resources/UI/Prefab/Race/Mobile/ItemSmall-Mobile.prefab
View File

@ -113,7 +113,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 35, y: 0}
m_SizeDelta: {x: 0, y: 14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4283453029241301366
@ -340,7 +340,7 @@ RectTransform:
- {fileID: 4384910997898086862}
- {fileID: 2557443790752454192}
m_Father: {fileID: 5521075338391914460}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -435,7 +435,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &6478029046036993396
RectTransform:
m_ObjectHideFlags: 0
@ -448,7 +448,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5521075338391914460}
m_RootOrder: 0
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -482,7 +482,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: a27b45d6a99f2744a98c957cfaea7599, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -516,7 +516,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 20
radius: 10
--- !u!1 &4064341129724416486
GameObject:
m_ObjectHideFlags: 0
@ -629,7 +629,7 @@ RectTransform:
- {fileID: 3598908100688004633}
- {fileID: 2555661253346764242}
m_Father: {fileID: 5521075338391914460}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -943,7 +943,6 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6478029046036993396}
- {fileID: 5521075338908913119}
- {fileID: 5521075339206499433}
- {fileID: 5521075339293163152}
@ -952,6 +951,7 @@ RectTransform:
- {fileID: 5916474674030172020}
- {fileID: 3712440285028526962}
- {fileID: 6892072823467183823}
- {fileID: 6478029046036993396}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1383,7 +1383,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5521075338391914460}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@ -1610,7 +1610,7 @@ RectTransform:
- {fileID: 5521075338411426021}
- {fileID: 5468041636962460519}
m_Father: {fileID: 5521075338391914460}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@ -1745,7 +1745,7 @@ RectTransform:
- {fileID: 5521075337666401916}
- {fileID: 5521075338227377345}
m_Father: {fileID: 5521075338391914460}
m_RootOrder: 3
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}
@ -2001,7 +2001,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 28, y: 0}
m_SizeDelta: {x: 0, y: 22}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6307907517525328669
@ -2261,7 +2261,7 @@ RectTransform:
- {fileID: 1745325752441454819}
- {fileID: 6024573468857070111}
m_Father: {fileID: 5521075338391914460}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -2416,7 +2416,7 @@ RectTransform:
- {fileID: 4345523542323456787}
- {fileID: 2216539168568584177}
m_Father: {fileID: 5521075338391914460}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -2604,7 +2604,7 @@ RectTransform:
- {fileID: 3876731566339814338}
- {fileID: 499348584704984197}
m_Father: {fileID: 5521075338391914460}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}

2512
Assets/Scenes/Login-Mobile.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/Scenes/MainScene.unity
View File

@ -418,7 +418,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &684809390
RectTransform:
m_ObjectHideFlags: 0

2
Assets/Scripts/App.cs
View File

@ -11,7 +11,7 @@ using Assets.Scripts.Devices;
public static class App
{
public static string Host = "http://192.168.0.101:5085/";
public static string Host = "http://192.168.0.101:5087/";
public static string AppVersion = Application.version;

13
Assets/Scripts/Mobile/Interface/INativeOnMobileWxLoginResp.cs Normal file
View File

@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Assets.Scripts.Mobile.Interface
{
interface INativeOnMobileWxLoginResp
{
void OnMobileWxLoginResp(string res);
}
}

11
Assets/Scripts/Mobile/Interface/INativeOnMobileWxLoginResp.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 95e502fb53efbff428f077e54f0d5f1d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

12
Assets/Scripts/Mobile/LoginControllerMobile.cs
View File

@ -1,4 +1,5 @@
using Assets.Scripts;
using Assets.Scripts.Mobile.Interface;
using DG.Tweening;
using System;
using System.Collections;
@ -6,7 +7,7 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class LoginControllerMobile : MonoBehaviour
public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
{
// Start is called before the first frame update
ScrollRect loginScrollView;
@ -70,6 +71,13 @@ public class LoginControllerMobile : MonoBehaviour
/// <param name="res"></param>
public void OnMobileWxLoginResp(string res)
{
Utils.showToast(gameObject, res, type: 1);
if (res.Contains("true;"))
{
GetComponent<LoginController>().goWxLoginWithCode(res.Replace("true;", ""), "mobile");
}
else
{
Utils.showToast(null, res.Replace("false;", ""));
}
}
}

80
Assets/Scripts/Scenes/LoginController.cs
View File

@ -593,51 +593,55 @@ public class LoginController : MonoBehaviour
//var acjson = await ConfigHelper.thirdPartApi.GetWxAccessToken(groups[1].Value);
//var infojson = await ConfigHelper.thirdPartApi.GetWxUserInfo(
// acjson.Value<string>("access_token"), acjson.Value<string>("openid"));
//string unionId = wxInfoJson.Value<string>("unionid"),
// openId = wxInfoJson.Value<string>("openid");
var r = await ConfigHelper.userApi.OnWebWxLoginCheckUnionIdByCode(groups[1].Value, groups[2].Value);
if (r.result)
{
JObject data = JObject.FromObject(r.data);
if (data.Value<string>("success") != null && data.Value<string>("success") == "False")
{
wxInfoJson = data;
wxLogin2.gameObject.SetActive(true);
Utils.DisplayImage(wxLogin2.Find("Avatar").GetComponent<RawImage>(),
wxInfoJson.Value<string>("headimgurl"));
wxLogin2.Find("NickName").GetComponent<Text>().text = wxInfoJson.Value<string>("nickname");
wxLogin3.gameObject.SetActive(true);
Utils.DisplayImage(wxLogin3.Find("Avatar").GetComponent<RawImage>(),
wxInfoJson.Value<string>("headimgurl"));
wxLogin3.Find("NickName").GetComponent<Text>().text = wxInfoJson.Value<string>("nickname");
pageNums = 5;
//this.goSign();
StartScrollPanel(2);
}
else
{
RefreshWx3(data.ToObject<UserResultModel>(), 1);
wxLogin3.gameObject.SetActive(true);
//Utils.DisplayImage(StartCoroutine,
//wxLogin3.Find("Avatar").GetComponent<RawImage>(),
//wxInfoJson.Value<string>("headimgurl"));
//wxLogin3.Find("NickName").GetComponent<Text>().text = wxInfoJson.Value<string>("nickname");
signContainer.gameObject.SetActive(false);
pageNums = 3;
//this.goSign();
StartScrollPanel(2);
}
}
else
{
Utils.showToast(gameObject, r.errMsg);
}
await goWxLoginWithCode(groups[1].Value, groups[2].Value);
}
}
}
#endif
public async Task goWxLoginWithCode(string code, string state)
{
var r = await ConfigHelper.userApi.OnWebWxLoginCheckUnionIdByCode(code,state);
if (r.result)
{
JObject data = JObject.FromObject(r.data);
if (data.Value<string>("success") != null && data.Value<string>("success") == "False")
{
wxInfoJson = data;
wxLogin2.gameObject.SetActive(true);
Utils.DisplayImage(wxLogin2.Find("Avatar").GetComponent<RawImage>(),
wxInfoJson.Value<string>("headimgurl"));
wxLogin2.Find("NickName").GetComponent<Text>().text = wxInfoJson.Value<string>("nickname");
wxLogin3.gameObject.SetActive(true);
Utils.DisplayImage(wxLogin3.Find("Avatar").GetComponent<RawImage>(),
wxInfoJson.Value<string>("headimgurl"));
wxLogin3.Find("NickName").GetComponent<Text>().text = wxInfoJson.Value<string>("nickname");
pageNums = 5;
//this.goSign();
StartScrollPanel(2);
}
else
{
RefreshWx3(data.ToObject<UserResultModel>(), 1);
wxLogin3.gameObject.SetActive(true);
//Utils.DisplayImage(StartCoroutine,
//wxLogin3.Find("Avatar").GetComponent<RawImage>(),
//wxInfoJson.Value<string>("headimgurl"));
//wxLogin3.Find("NickName").GetComponent<Text>().text = wxInfoJson.Value<string>("nickname");
signContainer.gameObject.SetActive(false);
pageNums = 3;
//this.goSign();
StartScrollPanel(2);
}
}
else
{
Utils.showToast(gameObject, r.errMsg);
}
}
private void goThirdNext()
{
this.StartScrollPanel(4);

4
Assets/Scripts/UI/Prefab/MapList/MapItem.cs
View File

@ -155,6 +155,8 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
//SetActive4Button(false);
SetColor(false);
#else
transform.Find("Shadow").GetComponent<Image>().DOFade(0, 0.3f);
#endif
}
public void OnPointerEnter(PointerEventData eventData)
@ -170,6 +172,8 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
Cursor.SetCursor(Resources.Load<Texture2D>("Images/PointerButtonHover"), Vector2.zero, CursorMode.Auto);
//SetActive4Button(true);
SetColor(true);
#else
transform.Find("Shadow").GetComponent<Image>().DOFade(1, 0.3f);
#endif
}
void SetActive4Button(bool b)

1
Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
View File

@ -433,6 +433,7 @@ public class EditUserController : PFUIPanel, INativeOnMobileImageSelect
public void OnMobileImageSelect(string res)
{
Debug.Log(res);
if (res.IndexOf("true,") == 0)
{
var path = res.Replace("true,", "");

30
Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs
View File

@ -9,10 +9,7 @@ using UnityEngine.EventSystems;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class RaceItemScript : MonoBehaviour
#if !(UNITY_ANDROID||UNITY_IOS)
, IPointerExitHandler, IPointerEnterHandler, IPointerUpHandler
#endif
public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, IPointerUpHandler
{
// Start is called before the first frame update
public enum ItemType { big, small }
@ -215,6 +212,7 @@ public class RaceItemScript : MonoBehaviour
status.GetComponent<ContentFitterController>().Refresh();
}
}
#if !(UNITY_ANDROID || UNITY_IOS)
float? localY = null;
public void OnPointerExit(PointerEventData eventData)
{
@ -281,6 +279,28 @@ public class RaceItemScript : MonoBehaviour
Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
}
#else
public void OnPointerExit(PointerEventData eventData)
{
if (_from == "list")
{
transform.Find("Masking").GetComponent<CanvasGroup>().DOFade(0, 0.3f);
}
}
public void OnPointerEnter(PointerEventData eventData)
{
if (_from == "list")
{
transform.Find("Masking").GetComponent<CanvasGroup>().DOFade(1, 0.3f);
}
}
public void OnPointerUp(PointerEventData eventData)
{
}
#endif
public void Join()
{
var res = ConfigHelper.mapCompetitionApi.ApplyMapCompetition(mapCompetition.Id);
@ -321,4 +341,6 @@ public class RaceItemScript : MonoBehaviour
Utils.showToast(null, res.errMsg, type: 0);
}
}
}

4
Assets/Scripts/UI/Prefab/ResultList/ResultListController.cs
View File

@ -26,6 +26,8 @@ public class ResultListController : PFUIPanel
{
{0,"routes" },{1,"competition" }
};
//交互用
public Transform currentItem { get; set; }
void Awake()
{
//ApiBase.SetCookie("73385F5F719B610D132C1ECF3E9143272BF15214D57ED91CD7A9DFD832407471535112AAEB8E9271F75D54FBBF2D99F18FA313C1EEA5676F5D722D7FBB07C926BEC5905591BF9AFDDC6336552DF273112C2DA1794E6FA2F465B11FECD2E82E52");
@ -201,7 +203,7 @@ public class ResultListController : PFUIPanel
foreach (var item in list)
{
var obj = Instantiate(routeResult);
obj.GetComponent<RouteItem>().Initial(item, index);
obj.GetComponent<RouteItem>().Initial(item, index, transform);
//obj.SendMessage("Initial", );
obj.transform.parent = content;
obj.transform.localScale = new Vector3(1, 1, 1);

14
Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs
View File

@ -31,8 +31,14 @@ public class RouteItem : MonoBehaviour
RouteResult data;
//滑动索引 0route 1match
int index;
public void Initial(RouteResult result,int index)
//交互用
private Transform parent { get; set; }
public void Initial(RouteResult result,int index,Transform parent = null)
{
if (parent)
{
this.parent = parent;
}
routeResult = result;
this.index = index;
left = transform.Find("BigLeft/Left");
@ -295,6 +301,12 @@ public class RouteItem : MonoBehaviour
public void OnPointerEnter(PointerEventData eventData)
{
var pController = parent.GetComponent<ResultListController>();
if (pController.currentItem)
{
pController.currentItem.GetComponent<RouteItem>().OnPointerExit(null);
}
pController.currentItem = transform;
transform.GetComponent<Image>().color = Utils.HexToColorHtml("#353543");
//if (index == 1)
//{