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

iosbug；android不需要导出项目；修改样式；可修改头像

Browse Source
This commit is contained in:
CaiYanPeng 2021-09-09 15:44:28 +08:00
parent 50ad74bb09
commit f1f982b90c
28 changed files with 500 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

2
Assets/Plugins/Android/ImageSelector.jar.meta → Assets/Plugins/Android/ImageSelector-release.aar.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6ea86a8936b718949b5501d873739db1
guid: 9722f205596f2fd499991ea299119cc8
PluginImporter:
externalObjects: {}
serializedVersion: 2

BIN
Assets/Plugins/Android/ImageSelector.jar
View File

Binary file not shown.

1
Assets/Plugins/Android/mainTemplate.gradle
View File

@ -12,6 +12,7 @@ dependencies {
implementation(name: 'libcore-release', ext:'aar')
implementation(name: 'libtelemetry-full-release', ext:'aar')
implementation(name: 'UnityCallWechatShare-release', ext:'aar')
implementation files ('libs/ImageSelector-release.aar')
}
android {

8
Assets/Plugins/Android/res/xml.meta
View File

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

21
Assets/Plugins/Android/res/xml/file_paths.xml
View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<root-path
name="root"
path="." />
<files-path
name="files"
path="." />
<cache-path
name="cache"
path="/"/>
<external-path
name="external"
path="." />
<external-cache-path
name="external_cache"
path="." />
<external-files-path
name="external_file"
path="." />
</paths>

7
Assets/Plugins/Android/res/xml/file_paths.xml.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 62c5e709a0ec9c341b10410af98decb5
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4
Assets/Plugins/iOS/IOSCameraController.h
View File

@ -1,5 +1,7 @@
//import 引用头文件 相当于Using
#import<QuartzCore/CADisplayLink.h>
//声明一个IOSCameraController类 继承自UIViewController <>里面是是协议/代理的调用声明 可以理解为c#的接口
@interface IOSCameraController : UIViewController<UIImagePickerControllerDelegate,UINavigationControllerDelegate>
@interface IOSCameraController : UIViewController<UIImagePickerControllerDelegate,UINavigationControllerDelegate>{
@public NSString * pageName;
}
@end

8
Assets/Plugins/iOS/IOSCameraController.m
View File

@ -76,7 +76,7 @@
[data writeToFile:path atomically:YES];
//保存之后通知unity 执行对应的回调
//UnitySendMessage 是用来给unity发消息的 有三个参数 1.挂载对应回调脚本的物体名 2.回调函数的名称 3.对应回调上的参数
UnitySendMessage("FeedbackModal(Clone)", "OnMobileImageSelect", [NSString stringWithFormat:@"true,%@",path ].UTF8String);
UnitySendMessage(pageName.UTF8String, "OnMobileImageSelect", [NSString stringWithFormat:@"true,%@",path ].UTF8String);
}
#pragma mark 图片处理方法
//图片旋转处理
@ -156,14 +156,16 @@
extern "C" {
#endif
//导出接口供unity使用
void IOS_OpenCamera(){
void IOS_OpenCamera(const char * pageName){
IOSCameraController *app = [[IOSCameraController alloc]init];
app->pageName = [NSString stringWithUTF8String:pageName];
UIViewController *vc = UnityGetGLViewController();
[vc.view addSubview:app.view];
[app OpenTarget:UIImagePickerControllerSourceTypeCamera];
}
void IOS_OpenAlbum(){
void IOS_OpenAlbum(const char * pageName){
IOSCameraController *app = [[IOSCameraController alloc]init];
app->pageName = [NSString stringWithUTF8String:pageName];
UIViewController *vc = UnityGetGLViewController();
[vc.view addSubview:app.view];
[app OpenTarget:UIImagePickerControllerSourceTypePhotoLibrary];

9
Assets/Plugins/iOS/WechatNativeBridge.m
View File

@ -88,16 +88,17 @@ void OpenWXApp()
[WXApi openWXApp];
}
bool checkAPPIsExist(NSString* URLScheme)
bool checkAPPIsExist(const char * URLScheme)
{
NSURL* url;
if ([URLScheme containsString:@"://"])
NSString * urls = [NSString stringWithUTF8String:URLScheme];
if ([urls containsString:@"://"])
{
url = [NSURL URLWithString:[NSString stringWithFormat:@"%@",URLScheme]];
url = [NSURL URLWithString:[NSString stringWithFormat:@"%@",urls]];
}
else
{
url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://",URLScheme]];
url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://",urls]];
}
if([[UIApplication sharedApplication] canOpenURL:url])
{

BIN
Assets/Resources/Images/Mobile/shadow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

128
Assets/Resources/Images/Mobile/shadow.png.meta Normal file
View File

@ -0,0 +1,128 @@
fileFormatVersion: 2
guid: 44eed58611fb526488c3664504b4a0a1
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:

16
Assets/Resources/UI/Prefab/Panel/Mobile/EditUserPanel.prefab
View File

@ -5285,7 +5285,7 @@ PrefabInstance:
- target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_SizeDelta.x
value: 40
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -5375,12 +5375,12 @@ PrefabInstance:
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 148
value: 50
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -364
value: -146
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -5405,7 +5405,7 @@ PrefabInstance:
- target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -5415,22 +5415,22 @@ PrefabInstance:
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -9
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}

2
Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab
View File

@ -38,7 +38,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 3, y: -10}
m_SizeDelta: {x: -14, y: -20}
m_SizeDelta: {x: -14, y: -10}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &465239218947862514
CanvasRenderer:

77
Assets/Resources/UI/Prefab/Panel/Mobile/RaceDetailModal.prefab
View File

@ -30,6 +30,7 @@ RectTransform:
m_Children:
- {fileID: 300991727349330169}
- {fileID: 5238700825434142442}
- {fileID: 3249953945569601876}
m_Father: {fileID: 300991727591432256}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1631,7 +1632,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -210, y: -199}
m_AnchoredPosition: {x: -210, y: -205}
m_SizeDelta: {x: 190, y: 90}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5238700826149900199
@ -2857,6 +2858,80 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Rice Start Time
--- !u!1 &8614637095372919876
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3249953945569601876}
- component: {fileID: 7144964455133811269}
- component: {fileID: 383421175324865264}
m_Layer: 5
m_Name: Shadow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3249953945569601876
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8614637095372919876}
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: 300991727036703949}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -10}
m_SizeDelta: {x: 0, y: -305}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &7144964455133811269
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8614637095372919876}
m_CullTransparentMesh: 0
--- !u!114 &383421175324865264
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8614637095372919876}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 44eed58611fb526488c3664504b4a0a1, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &8848845176364978951
GameObject:
m_ObjectHideFlags: 0

56
Assets/Resources/UI/Prefab/Panel/Mobile/RaceHomePanel.prefab
View File

@ -129,13 +129,14 @@ GameObject:
- component: {fileID: 2547147171398365227}
- component: {fileID: 6950270674676521777}
- component: {fileID: 2962819245497661191}
- component: {fileID: 4582195961826941797}
m_Layer: 5
m_Name: gq
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2547147171398365227
RectTransform:
m_ObjectHideFlags: 0
@ -176,7 +177,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -189,6 +190,19 @@ MonoBehaviour:
y: 0
width: 1
height: 1
--- !u!114 &4582195961826941797
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1703012134833883404}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 26
--- !u!1 &2322805962556808324
GameObject:
m_ObjectHideFlags: 0
@ -1799,7 +1813,7 @@ MonoBehaviour:
m_Bottom: 10
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 1
m_StartAxis: 0
m_CellSize: {x: 158, y: 170}
m_Spacing: {x: 10, y: 10}
m_Constraint: 0
@ -1913,12 +1927,12 @@ PrefabInstance:
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
@ -1928,7 +1942,7 @@ PrefabInstance:
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -9
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
@ -2098,12 +2112,12 @@ PrefabInstance:
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
@ -2113,7 +2127,7 @@ PrefabInstance:
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -9
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6731556475519980336, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
@ -2168,12 +2182,12 @@ PrefabInstance:
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
@ -2183,17 +2197,17 @@ PrefabInstance:
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -9
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
@ -2203,7 +2217,7 @@ PrefabInstance:
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -2
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
@ -2238,15 +2252,15 @@ PrefabInstance:
m_RemovedComponents:
- {fileID: 829206726517620079, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
--- !u!1 &8089048072454713058 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
m_PrefabInstance: {fileID: 6115751004523743072}
m_PrefabAsset: {fileID: 0}
--- !u!224 &8089048072454713059 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
m_PrefabInstance: {fileID: 6115751004523743072}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8089048072454713058 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
m_PrefabInstance: {fileID: 6115751004523743072}
m_PrefabAsset: {fileID: 0}

20
Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab
View File

@ -1749,7 +1749,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -8}
m_SizeDelta: {x: 0, y: -16}
m_SizeDelta: {x: 0, y: -8}
m_Pivot: {x: 0, y: 1}
--- !u!222 &4605362255460975190
CanvasRenderer:
@ -1854,7 +1854,7 @@ MonoBehaviour:
m_Left: 0
m_Right: 0
m_Top: 2
m_Bottom: 2
m_Bottom: 0
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
@ -2318,13 +2318,14 @@ GameObject:
- component: {fileID: 7081805938635351733}
- component: {fileID: 5052066067678859807}
- component: {fileID: 1032072723589897949}
- component: {fileID: 201928919969191625}
m_Layer: 5
m_Name: gq
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &7081805938635351733
RectTransform:
m_ObjectHideFlags: 0
@ -2378,6 +2379,19 @@ MonoBehaviour:
y: 0
width: 1
height: 1
--- !u!114 &201928919969191625
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5043445467111231433}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 26
--- !u!1 &5299950768805647023
GameObject:
m_ObjectHideFlags: 0

163
Assets/Resources/UI/Prefab/Race/Banner/BannerItem-Mobile.prefab
View File

@ -29,7 +29,8 @@ RectTransform:
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_Children:
- {fileID: 3454093997580430476}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -85,3 +86,163 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
radius: 20
--- !u!1001 &312552726881420844
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6596492163791180230}
m_Modifications:
- target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_SizeDelta.x
value: 74
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_SizeDelta.y
value: 32
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Name
value: BtnEnter
objectReference: {fileID: 0}
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: Enter
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: mType
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}
--- !u!224 &3454093997580430476 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
m_PrefabInstance: {fileID: 312552726881420844}
m_PrefabAsset: {fileID: 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:5084/";
public static string Host = "http://192.168.0.101:5085/";
public static string AppVersion = Application.version;

10
Assets/Scripts/Mobile/ImageSelectorController.cs
View File

@ -8,9 +8,9 @@ public class ImageSelectorController
private AndroidJavaObject mainActivityObject = null;
#if UNITY_IOS
[DllImport("__Internal")]
private static extern void IOS_OpenCamera();
private static extern void IOS_OpenCamera(string pageName);
[DllImport("__Internal")]
private static extern void IOS_OpenAlbum();
private static extern void IOS_OpenAlbum(string pageName);
#endif
private static ImageSelectorController _instance;
public static ImageSelectorController Instance
@ -36,12 +36,12 @@ public class ImageSelectorController
#endif
}
public void Select()
public void Select(string pageName)
{
#if UNITY_IOS
IOS_OpenAlbum();
IOS_OpenAlbum(pageName);
#else
mainActivityObject.Call("Select");
mainActivityObject.Call("Select",pageName);
#endif
}
}

2
Assets/Plugins/Android/res.meta → Assets/Scripts/Mobile/Interface.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 976ab7a2bf2e3224c835cdaeb965e28e
guid: 95192428b4cb1074ebe79c54bc82b61c
folderAsset: yes
DefaultImporter:
externalObjects: {}

13
Assets/Scripts/Mobile/Interface/INativeOnMobileImageSelect.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 INativeOnMobileImageSelect
{
void OnMobileImageSelect(string res);
}
}

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

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

5
Assets/Scripts/UI/Prefab/FeedbackController.cs
View File

@ -1,5 +1,6 @@
using Assets.Scripts;
using Assets.Scripts.Apis;
using Assets.Scripts.Mobile.Interface;
using Assets.Scripts.UI.Control;
using System;
using System.Collections;
@ -9,7 +10,7 @@ using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
public class FeedbackController : PFUIPanel
public class FeedbackController : PFUIPanel, INativeOnMobileImageSelect
{
// Start is called before the first frame update
Transform main,images;
@ -80,7 +81,7 @@ public class FeedbackController : PFUIPanel
{
#if UNITY_ANDROID || UNITY_IOS
selectObject = ((PointerEventData)e).pointerEnter;
App.imageSelectorController.Select();
App.imageSelectorController.Select("FeedbackModal(Clone)");
#else
var self = ((PointerEventData)e).pointerEnter;
Utils.OpenFile((path) =>

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

@ -1,6 +1,7 @@
using Assets.Scripts;
using Assets.Scripts.Apis;
using Assets.Scripts.Apis.Models;
using Assets.Scripts.Mobile.Interface;
using Assets.Scripts.UI.Control;
using Assets.Scripts.UI.UIEffect;
using DG.Tweening;
@ -17,7 +18,7 @@ using UnityEngine.EventSystems;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class EditUserController : PFUIPanel
public class EditUserController : PFUIPanel, INativeOnMobileImageSelect
{
private Button mSaveButton;
private PFUIDropdown mSexDropdown;
@ -104,6 +105,7 @@ public class EditUserController : PFUIPanel
UIManager.AddEvent(mBackButton.gameObject, EventTriggerType.PointerClick, Cancel);
UIManager.AddEvent(mChangeAvatar.gameObject, EventTriggerType.PointerClick, (e) =>
{
#if !(UNITY_ANDROID || UNITY_IOS)
OpenFileName ofn = new OpenFileName();
ofn.structSize = Marshal.SizeOf(ofn);
@ -131,6 +133,9 @@ public class EditUserController : PFUIPanel
{
ChangeAvatar(ofn.file);
}
#else
App.imageSelectorController.Select("EditUserPanel(Clone)");
#endif
});
linkContainer = transform.Find("LinkContainer");
@ -425,4 +430,13 @@ public class EditUserController : PFUIPanel
// UIManager.ShowPrePanel();
//}
}
public void OnMobileImageSelect(string res)
{
if (res.IndexOf("true,") == 0)
{
var path = res.Replace("true,", "");
ChangeAvatar(path);
}
}
}

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

@ -138,7 +138,7 @@ public class HomeController : PFUIPanel
}
else
{
UIManager.ShowConfirm("未检测到应用", "是否前往官网下载?", () =>
UIManager.ShowConfirm("Workouts not installed", "Go to the official website to download?", () =>
{
UIManager.CloseConfirm();
Application.OpenURL("http://www.powerfun.com/Download");

10
Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs
View File

@ -165,11 +165,17 @@ public class RaceHomeScript : RaceScript
//{
// banner.GetComponent<RawImage>().color = Utils.HexToColorHtml("#0000ff");
//}
UIManager.AddEvent(banner.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
#if !(UNITY_ANDROID || UNITY_IOS)
UIManager.AddEvent(banner, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
OnBannerClick(activity);
});
#else
UIManager.AddEvent(banner.transform.Find("BtnEnter").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
OnBannerClick(activity);
});
#endif
banner.transform.SetParent(scroll.content);
dot.GetComponent<Image>().color =
i == 0 ? Utils.HexToColorHtml("#f93086") : Utils.HexToColorHtml("#ffffff");

1
ProjectSettings/GraphicsSettings.asset
View File

@ -38,7 +38,6 @@ 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}