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

pc版首页；安卓google登录；解决fb登录ios问题

Browse Source
This commit is contained in:
CaiYanPeng 2022-01-12 15:31:57 +08:00
parent f0df68bbda
commit 91fa3cc82d
16 changed files with 3642 additions and 2796 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Assets/BannerController.cs
View File

@ -103,7 +103,7 @@ public class BannerController : MonoBehaviour
};
TouchKit.addGestureRecognizer(pan);
}
int sIndex = 0, eIndex = 2;
private void Start()
{
GetList();
@ -115,6 +115,7 @@ public class BannerController : MonoBehaviour
{
if (res.data.Count >= 3)
{
sIndex = 0;eIndex = 2;
Initial(res.data);
gameObject.SetActive(true);
}
@ -150,7 +151,6 @@ public class BannerController : MonoBehaviour
c.GetComponent<Button>().onClick.AddListener(()=>GoDetail(c));
}
}
currentIndex = 1;
this.list = list;
}
bool animateLock = false;
@ -169,11 +169,15 @@ public class BannerController : MonoBehaviour
Sequence se = DOTween.Sequence();
se.Join(center.DOFade(0.5f, 0.3f));
se.Join(center.GetComponent<RectTransform>().DOScale(Vector3.one * 0.8f, 0.3f));
se.Join(center.GetComponent<RectTransform>().DOLocalMoveX(43, 0.3f));
se.Join(right.GetComponent<RectTransform>().DOLocalMoveX(-43, 0.3f));
var area = list[((currentIndex++) + list.Count) % list.Count];
se.Join(center.GetComponent<RectTransform>().DOLocalMoveX(offset, 0.3f));
se.Join(right.GetComponent<RectTransform>().DOLocalMoveX(-1* offset, 0.3f));
var area = list[((sIndex - 1) + list.Count) % list.Count];
sIndex--;
eIndex--;
if (sIndex < 0) sIndex = (sIndex + list.Count) % list.Count;
if (eIndex < 0) eIndex = (eIndex + list.Count) % list.Count;
Debug.Log($"{sIndex},{eIndex}");
right.GetComponent<RecommendController>().Initial(area, caches);
if (currentIndex >= list.Count) currentIndex = 0;
se.Join(left.DOFade(1, 0.3f));
se.Join(left.GetComponent<RectTransform>().DOScale(Vector3.one, 0.3f));
se.Join(left.GetComponent<RectTransform>().DOLocalMoveX(0, 0.3f));
@ -187,7 +191,11 @@ public class BannerController : MonoBehaviour
right.GetComponent<Button>().onClick.RemoveAllListeners();
right.GetComponent<Button>().onClick.AddListener(Right);
}
#if UNITY_STANDALONE_WIN
float offset = 110;
#else
float offset = 43;
#endif
private void Left()
{
int center = GetCenterIndex(),
@ -203,9 +211,14 @@ public class BannerController : MonoBehaviour
Sequence se = DOTween.Sequence();
se.Join(center.DOFade(0.5f, 0.3f));
se.Join(center.GetComponent<RectTransform>().DOScale(Vector3.one * 0.8f, 0.3f));
se.Join(center.GetComponent<RectTransform>().DOLocalMoveX(-43, 0.3f));
se.Join(left.GetComponent<RectTransform>().DOLocalMoveX(43, 0.3f));
var area = list[((currentIndex--) + list.Count) % list.Count];
se.Join(center.GetComponent<RectTransform>().DOLocalMoveX(-1* offset, 0.3f));
se.Join(left.GetComponent<RectTransform>().DOLocalMoveX(offset, 0.3f));
var area = list[((eIndex + 1) + list.Count) % list.Count];
sIndex++;
eIndex++;
if (sIndex >= list.Count - 1) sIndex = sIndex % list.Count;
if (eIndex >= list.Count - 1) eIndex = eIndex % list.Count;
Debug.Log($"{sIndex},{eIndex}");
var centerArea = list[currentIndex + 1];
left.GetComponent<RecommendController>().Initial(area, caches);
if (currentIndex < 0) currentIndex = list.Count - 1;

2
Assets/HomeMessageController.cs
View File

@ -25,7 +25,7 @@ public class HomeMessageController : MonoBehaviour
}
float playtime = 0;
#if UNITY_STANDALONE_WIN
float maxWidth = 226;
float maxWidth = 370;
#else
float maxWidth = 180;
#endif

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

Binary file not shown.

14
Assets/Plugins/iOS/IOSWechatController.m
View File

@ -8,6 +8,13 @@
#import "WXApi.h"
#import "UnityAppController.h"
#import <Foundation/Foundation.h>
#import <FBSDKCoreKit/FBSDKCoreKit.h>
#import <FBSDKLoginKit/FBSDKLoginKit.h>
#import <FBSDKShareKit/FBSDKShareKit.h>
#import <FBSDKGamingServicesKit/FBSDKGamingServicesKit.h>
#import <Foundation/NSJSONSerialization.h>
extern void UnitySendMessage(const char *,const char *,const char *);
@interface IOSWechatController : UnityAppController<WXApiDelegate>
@end
@ -29,7 +36,12 @@ IMPL_APP_CONTROLLER_SUBCLASS (IOSWechatController)
- (BOOL)application:(UIApplication*)application openURL:(NSURL*)url
options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
{
return [WXApi handleOpenURL:url delegate:self];
if([url.absoluteString containsString:@"fb1291883451314488powerfunx"]){
[[FBSDKApplicationDelegate sharedInstance] application:application openURL:url options:options];
return YES;
}else{
return [WXApi handleOpenURL:url delegate:self];
}
}
- (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url

3333
Assets/Resources/UI/Prefab/Panel/HomePanel.prefab
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

418
Assets/Scenes/MainScene.unity
View File

@ -488,92 +488,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 313551262}
m_CullTransparentMesh: 0
--- !u!21 &637190723
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: RoundedCornersTextureMaterial(Clone)
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Height: 50
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Radius: 15
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _UseUIAlphaClip: 0
- _Width: 50
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _WidthHeightRadius: {r: 30, g: 30, b: 30, a: 0}
--- !u!1 &684809389
GameObject:
m_ObjectHideFlags: 0
@ -972,92 +886,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 90, y: -30, z: 0}
--- !u!21 &977285556
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: RoundedCornersTextureMaterial(Clone)
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Height: 50
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Radius: 15
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _UseUIAlphaClip: 0
- _Width: 50
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _WidthHeightRadius: {r: 273, g: 44, b: 44, a: 0}
--- !u!1 &1378474435
GameObject:
m_ObjectHideFlags: 0
@ -1155,12 +983,12 @@ PrefabInstance:
- target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.x
value: 273
value: 446
objectReference: {fileID: 0}
- target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.y
value: 44
value: 70
objectReference: {fileID: 0}
- target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
@ -1200,12 +1028,12 @@ PrefabInstance:
- target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 1100
value: 1014
objectReference: {fileID: 0}
- target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -600
value: -451
objectReference: {fileID: 0}
- target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
@ -1222,6 +1050,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3342506722007875058, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: radius
value: 35
objectReference: {fileID: 0}
- target: {fileID: 3342506722007875061, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_Color2.a
@ -1245,37 +1078,47 @@ PrefabInstance:
- target: {fileID: 3342506723743580662, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.x
value: -47
value: -76
objectReference: {fileID: 0}
- target: {fileID: 3342506723743580662, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.y
value: 14
value: 20
objectReference: {fileID: 0}
- target: {fileID: 3342506723743580662, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 16.5
value: 28
objectReference: {fileID: 0}
- target: {fileID: 3342506723743580662, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -9
value: -13
objectReference: {fileID: 0}
- target: {fileID: 3342506723743580665, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 17
objectReference: {fileID: 0}
- target: {fileID: 3342506723743580665, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_FontData.m_Alignment
value: 3
objectReference: {fileID: 0}
- target: {fileID: 3342506723879539844, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.x
value: 30
value: 50
objectReference: {fileID: 0}
- target: {fileID: 3342506723879539844, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.y
value: 30
value: 50
objectReference: {fileID: 0}
- target: {fileID: 3342506723879539844, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 7
value: 10
objectReference: {fileID: 0}
- target: {fileID: 3342506723879539847, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
@ -1285,33 +1128,58 @@ PrefabInstance:
- target: {fileID: 3342506723879539849, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: radius
value: 15
value: 25
objectReference: {fileID: 0}
- target: {fileID: 4467515848031294650, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.x
value: -47
value: -76
objectReference: {fileID: 0}
- target: {fileID: 4467515848031294650, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.y
value: 12
value: 20
objectReference: {fileID: 0}
- target: {fileID: 4467515848031294650, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 16.5
value: 28
objectReference: {fileID: 0}
- target: {fileID: 4467515848031294650, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -23
value: -37
objectReference: {fileID: 0}
- target: {fileID: 4864779298271313415, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 17
objectReference: {fileID: 0}
- target: {fileID: 7479474444580396582, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7479474444580396582, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7479474444580396582, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.y
value: 20
objectReference: {fileID: 0}
- target: {fileID: 7479474444580396582, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7479474444580396582, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, type: 3}
--- !u!224 &1426339559 stripped
@ -1320,6 +1188,92 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 1426339558}
m_PrefabAsset: {fileID: 0}
--- !u!21 &1469391097
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: RoundedCornersTextureMaterial(Clone)
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Height: 50
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Radius: 15
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _UseUIAlphaClip: 0
- _Width: 50
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _WidthHeightRadius: {r: 50, g: 50, b: 50, a: 0}
--- !u!1 &1565405865 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3342506722007875022, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
@ -1334,7 +1288,7 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1565405865}
m_Enabled: 1
m_Alpha: 0
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
@ -1502,6 +1456,92 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1726804851}
m_CullTransparentMesh: 0
--- !u!21 &1729208821
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: RoundedCornersTextureMaterial(Clone)
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Height: 50
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Radius: 15
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _UseUIAlphaClip: 0
- _Width: 50
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _WidthHeightRadius: {r: 446, g: 70, b: 70, a: 0}
--- !u!1 &1962586925
GameObject:
m_ObjectHideFlags: 0

2
Assets/Scripts/App.cs
View File

@ -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:5084/";
public static string AppVersion = Application.version;

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

@ -19,8 +19,6 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
void Awake()
{
transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Wechat")
.gameObject.SetActive(App.weChatController.IsWeChatAppInstalled());
loginScrollView = transform.Find("Panel/LoginContainer/LoginScrollView").GetComponent<ScrollRect>();
thirdLoginPage = loginScrollView.content.Find("FormContainer-Login/Mask/FormContainer-third");
//UIManager.AddEvent(loginScrollView.content.Find("FormContainer-Login/Mask/FormContainer/BtnThirdLogin").gameObject,
@ -44,6 +42,10 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
DateTime.Now.ToString("HH:mm");
weChat = App.weChatController;
weChat.Init(App.WxAppId);
#if UNITY_IOS
transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Wechat")
.gameObject.SetActive(App.weChatController.IsWeChatAppInstalled());
#endif
#if UNITY_IOS
UIManager.AddEvent(transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Apple").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
@ -64,7 +66,7 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
});
UIManager.AddEvent(transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Google").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
//Utils.CallAndroidMethod("signInWithGoogle");
Utils.CallAndroidMethod("signInWithGoogle");
});
//App.weChatController.Init(App.WxAppId);
//var s = App.weChatController.isApplicationAvilible("com.gugoumainapp","powerfun").ToString();
@ -200,6 +202,7 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
public void OnMobileGoogleLoginResp(string res)
{
Utils.showToast(null, res);
Debug.Log(res);
//if (res.Contains("true;"))
//{
// GetComponent<LoginController>().goWxLoginWithCode(res.Replace("true;", ""), "mobile");

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

@ -1156,11 +1156,13 @@ public class LoginController : BaseScene
imagexf.localPosition = new Vector3(0, -669, 0);
LoginBg.localPosition = Vector3.zero;
LoginBg.GetComponent<RectTransform>().sizeDelta = new Vector2(360, 573);
#endif
#else
imagedf.GetComponent<Image>().color = new Color(255, 255, 255, 0);
imagexf.GetComponent<Image>().color = new Color(255, 255, 255, 0);
LoginBg.GetComponent<RectTransform>().sizeDelta = new Vector2(354, 370);
LoginBg.GetComponent<RectTransform>().localPosition = new Vector2(LoginBg.GetComponent<RectTransform>().localPosition.x, 0);
#endif
var scrollValue = 1f / (pageNums - 1);
var value = 1 * scrollValue;

2
Assets/Scripts/Scenes/MainController.cs
View File

@ -179,7 +179,7 @@ public class MainController : BaseScene
msgIndex++;
}
#if UNITY_STANDALONE_WIN
float moveOffset = 46;
float moveOffset = 74;
#else
float moveOffset = 38;
#endif

4
Assets/Scripts/UI/Prefab/Panel/HomeController.cs
View File

@ -257,8 +257,8 @@ public class HomeController : PFUIPanel
todayData.Find("Datas/Climb/Rank").GetComponent<Text>().text = summary.CurrentTotalDistance == 0 ? "——" : $"+{summary.CurrentTotalDistance.ToString("#0.0")}";
todayData.Find("Datas/Carlories/Rank").GetComponent<Text>().text = summary.CurrentTotalKcal == 0 ? "——" : $"+{summary.CurrentTotalKcal.ToString("#0")}";
#if UNITY_STANDALONE_WIN
todayData.Find("NickName").GetComponent<Text>().text = App.CurrentUser.Nickname;
todayData.Find("ID").GetComponent<Text>().text = $"ID:{App.CurrentUser.Id.ToString("000000")}";
//todayData.Find("NickName").GetComponent<Text>().text = App.CurrentUser.Nickname;
//todayData.Find("ID").GetComponent<Text>().text = $"ID:{App.CurrentUser.Id.ToString("000000")}";
#endif
}

2
ProjectSettings/AndroidResolverDependencies.xml
View File

@ -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" />

4
ProjectSettings/EditorBuildSettings.asset
View File

@ -6,8 +6,8 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/Scenes/Login.unity
guid: 6dce3e17997730b4492f91dd8fede429
path: Assets/Scenes/Login-Mobile.unity
guid: 4be878da00cf764499988cf403faf94d
- enabled: 1
path: Assets/Scenes/MainScene.unity
guid: ab586a3c1bacd4a48a55178eb06fe0cc

1
ProjectSettings/GraphicsSettings.asset
View File

@ -38,6 +38,7 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}

10
ProjectSettings/ProjectSettings.asset
View File

@ -133,7 +133,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 2.1.0
bundleVersion: 2.1.1
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
@ -179,8 +179,8 @@ PlayerSettings:
applicationIdentifier:
Android: com.ZhiXingPai.PowerFunUnity
buildNumber:
iPhone: 2.1.0.5
AndroidBundleVersionCode: 13
iPhone: 2.1.1.0
AndroidBundleVersionCode: 15
AndroidMinSdkVersion: 24
AndroidTargetSdkVersion: 30
AndroidPreferredInstallLocation: 1
@ -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