比较提交
合并到: unity-tech-cn:main
unity-tech-cn:/main
unity-tech-cn:/fzhang
unity-tech-cn:/update
unity-tech-cn:/issue-19
unity-tech-cn:/UdpFix
unity-tech-cn:/yanmeng
unity-tech-cn:/AsSubmodule
unity-tech-cn:/v2
unity-tech-cn:/v3
unity-tech-cn:/fix-float
unity-tech-cn:/unity2020
unity-tech-cn:/GameService
unity-tech-cn:/CloudFunction
unity-tech-cn:/doc-game-service
unity-tech-cn:/unity2019
unity-tech-cn:/fix-game-service
unity-tech-cn:/new_facebook_package_test
unity-tech-cn:/update2022
unity-tech-cn:/revert-25-doc-game-service-proguard
unity-tech-cn:/main/marcusl
unity-tech-cn:/doc-game-service/proguard
拉取从: unity-tech-cn:v2
unity-tech-cn:/main
unity-tech-cn:/fzhang
unity-tech-cn:/update
unity-tech-cn:/issue-19
unity-tech-cn:/UdpFix
unity-tech-cn:/yanmeng
unity-tech-cn:/AsSubmodule
unity-tech-cn:/v2
unity-tech-cn:/v3
unity-tech-cn:/fix-float
unity-tech-cn:/unity2020
unity-tech-cn:/GameService
unity-tech-cn:/CloudFunction
unity-tech-cn:/doc-game-service
unity-tech-cn:/unity2019
unity-tech-cn:/fix-game-service
unity-tech-cn:/new_facebook_package_test
unity-tech-cn:/update2022
unity-tech-cn:/revert-25-doc-game-service-proguard
unity-tech-cn:/main/marcusl
unity-tech-cn:/doc-game-service/proguard
此合并请求有变更与目标分支冲突。
/Assets/HuaweiServiceDemo/Scenes/HmsGameServiceDemo.unity
/Assets/HuaweiServiceDemo/Scripts/udpServiceSampleScript.cs
/Assets/Plugins/Android/baseProjectTemplate.gradle
/Assets/Plugins/Android/launcherTemplate.gradle
/Assets/Plugins/Android/mainTemplate.gradle
/Assets/HuaweiService/game_service/GameService.dll
/Assets/HuaweiServiceDemo/Scenes/HmsGameServiceDemo.unity.meta
5 次代码提交
作者 | SHA1 | 备注 | 提交日期 |
---|---|---|---|
siyao | 3f8d04e6 | update game service | 3 年前 |
siyao | de3929fc | update game service | 3 年前 |
siyao | 890ce070 | fix touch | 3 年前 |
siyao | 4cdf18a2 | fix credential | 3 年前 |
siyao | 7a0e1bab | update packages | 3 年前 |
共有 37 个文件被更改,包括 1789 次插入 和 1607 次删除
-
6Assets/Plugins/Android/mainTemplate.gradle.2018
-
10Assets/Plugins/Android/mainTemplate.gradle
-
3Assets/Plugins/Android/baseProjectTemplate.gradle
-
18Assets/Plugins/Android/launcherTemplate.gradle
-
211Assets/HuaweiServiceDemo/Scenes/HmsGameServiceDemo.unity
-
2Assets/HuaweiServiceDemo/Scenes/HmsGameServiceDemo.unity.meta
-
3Assets/HuaweiServiceDemo/Scripts/test/apm/EnableGamePluginButton.cs
-
8Assets/HuaweiServiceDemo/Scripts/test/apm/GameApmTest.cs
-
2Assets/HuaweiServiceDemo/Scripts/test/ads/AdsTest.cs
-
80Assets/HuaweiServiceDemo/Scripts/udpServiceSampleScript.cs
-
4Assets/HuaweiService/apm/APMS.cs
-
4Assets/HuaweiService/apm/GameAPM.cs
-
4Assets/HuaweiService/apm/GameAttribute.cs
-
9Assets/HuaweiService/crash/AGConnectCrash.cs
-
7Assets/HuaweiService/app_linking/AGConnectAppLinking.cs
-
80Assets/HuaweiService/app_linking/AppLinking.cs
-
18Assets/HuaweiService/app_linking/ResolvedLinkData.cs
-
9Assets/HuaweiService/Auth/AGCAuthException.cs
-
29Assets/HuaweiService/Auth/AGConnectAuth.cs
-
15Assets/HuaweiService/Auth/AGConnectUser.cs
-
16Assets/HuaweiService/cloud_storage/AGCStorageManagement.cs
-
9Assets/HuaweiService/cloud_storage/StorageException.cs
-
542Assets/HuaweiService/Android/huaweiappgallery.aar
-
999Assets/HuaweiService/Android/huaweiextension.aar
-
969Assets/HuaweiService/game_service/GameService.dll
-
26Assets/HuaweiService/base/AGCRoutePolicy.cs
-
34Assets/HuaweiService/base/AGConnectInstance.cs
-
43Assets/HuaweiService/base/AGConnectOptions.cs
-
64Assets/HuaweiService/base/AGConnectOptionsBuilder.cs
-
16Assets/HuaweiService/base/CustomAuthProvider.cs
-
16Assets/HuaweiService/base/CustomCredentialsProvider.cs
-
16Assets/HuaweiService/app_linking/ReferrerProvider.cs
-
30Assets/HuaweiService/Auth/AuthApi.cs
-
34Assets/HuaweiService/Auth/AuthLoginListener.cs
-
25Assets/HuaweiService/credential/AGCInstanceID.cs
-
35Assets/HuaweiService/credential/AccessNetworkManager.cs
|
|||
fileFormatVersion: 2 |
|||
guid: e2feccc4736cc49b38b22818510afbb8 |
|||
guid: 26a597a7770e74bfbac8f7815a04edcf |
|||
DefaultImporter: |
|||
externalObjects: {} |
|||
userData: |
80
Assets/HuaweiServiceDemo/Scripts/udpServiceSampleScript.cs
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
PK |
|||
|