Prechádzať zdrojové kódy

<Auto Generated by Git> 合并最新版ios分支部分。更新最新的内容合并

# Conflicts:
#	Assets/BowArrow/InfraredCamera/InfraredDemo.cs
#	Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/HomeView.prefab
#	Assets/BowArrow/Scenes/Entry.unity
#	Assets/BowArrow/Scenes/GameChallengeScene/GameChallenge.unity
#	Assets/BowArrow/Scenes/Login.unity
#	Assets/BowArrow/Scripts/Bluetooth/ShootCheck.cs
#	Assets/BowArrow/Scripts/View/Home/HomeView.cs
#	Assets/Game_Hyperspace/Script/UIManager.cs
#	ProjectSettings/EditorBuildSettings.asset
slambb 5 mesiacov pred
rodič
commit
138652760f
100 zmenil súbory, kde vykonal 1100 pridanie a 915 odobranie
  1. 1 1
      Assets/AddressableAssetsData.meta
  2. 136 0
      Assets/AddressableAssetsData/AddressableAssetSettings.asset
  3. 2 2
      Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta
  4. 1 1
      Assets/AddressableAssetsData/AssetGroupTemplates.meta
  5. 76 0
      Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset
  6. 2 2
      Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta
  7. 1 1
      Assets/AddressableAssetsData/AssetGroups.meta
  8. 32 0
      Assets/AddressableAssetsData/AssetGroups/Built In Data.asset
  9. 2 2
      Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta
  10. 25 0
      Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
  11. 8 0
      Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta
  12. 1 1
      Assets/AddressableAssetsData/AssetGroups/Schemas.meta
  13. 17 0
      Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset
  14. 8 0
      Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta
  15. 45 0
      Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset
  16. 8 0
      Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta
  17. 16 0
      Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset
  18. 8 0
      Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta
  19. 45 0
      Assets/AddressableAssetsData/AssetGroups/Schemas/Textures_BundledAssetGroupSchema.asset
  20. 8 0
      Assets/AddressableAssetsData/AssetGroups/Schemas/Textures_BundledAssetGroupSchema.asset.meta
  21. 16 0
      Assets/AddressableAssetsData/AssetGroups/Schemas/Textures_ContentUpdateGroupSchema.asset
  22. 8 0
      Assets/AddressableAssetsData/AssetGroups/Schemas/Textures_ContentUpdateGroupSchema.asset.meta
  23. 25 0
      Assets/AddressableAssetsData/AssetGroups/Textures.asset
  24. 8 0
      Assets/AddressableAssetsData/AssetGroups/Textures.asset.meta
  25. 8 0
      Assets/AddressableAssetsData/DataBuilders.meta
  26. 20 0
      Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset
  27. 8 0
      Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta
  28. 20 0
      Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset
  29. 8 0
      Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta
  30. 20 0
      Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset
  31. 8 0
      Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta
  32. 20 0
      Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset
  33. 8 0
      Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta
  34. 15 0
      Assets/AddressableAssetsData/DefaultObject.asset
  35. 8 0
      Assets/AddressableAssetsData/DefaultObject.asset.meta
  36. 27 0
      Assets/AddressableAssetsData/ProfileDataSourceSettings.asset
  37. 8 0
      Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta
  38. 8 0
      Assets/AddressableAssetsData/iOS.meta
  39. BIN
      Assets/AddressableAssetsData/iOS/addressables_content_state.bin
  40. 1 1
      Assets/AddressableAssetsData/iOS/addressables_content_state.bin.meta
  41. 1 1
      Assets/AppleSignInUnity/AppleAuth/AppleAuth.asmdef.meta
  42. 1 1
      Assets/AppleSignInUnity/AppleAuth/AppleAuthLoginArgs.cs.meta
  43. 3 3
      Assets/AppleSignInUnity/AppleAuth/AppleAuthManager.cs
  44. 1 1
      Assets/AppleSignInUnity/AppleAuth/AppleAuthManager.cs.meta
  45. 1 1
      Assets/AppleSignInUnity/AppleAuth/AppleAuthQuickLoginArgs.cs.meta
  46. 1 1
      Assets/AppleSignInUnity/AppleAuth/Editor.meta
  47. 1 1
      Assets/AppleSignInUnity/AppleAuth/Editor/AppleAuth.Editor.asmdef.meta
  48. 1 1
      Assets/AppleSignInUnity/AppleAuth/Editor/AppleAuthMacosPostprocessorHelper.cs.meta
  49. 57 37
      Assets/AppleSignInUnity/AppleAuth/Editor/ProjectCapabilityManagerExtension.cs
  50. 1 1
      Assets/AppleSignInUnity/AppleAuth/Editor/ProjectCapabilityManagerExtension.cs.meta
  51. 1 1
      Assets/AppleSignInUnity/AppleAuth/Enums.meta
  52. 1 1
      Assets/AppleSignInUnity/AppleAuth/Enums/AuthorizationErrorCode.cs.meta
  53. 1 1
      Assets/AppleSignInUnity/AppleAuth/Enums/CredentialState.cs.meta
  54. 1 1
      Assets/AppleSignInUnity/AppleAuth/Enums/LoginOptions.cs.meta
  55. 1 1
      Assets/AppleSignInUnity/AppleAuth/Enums/PersonNameFormatterStyle.cs.meta
  56. 1 1
      Assets/AppleSignInUnity/AppleAuth/Enums/RealUserStatus.cs.meta
  57. 1 1
      Assets/AppleSignInUnity/AppleAuth/Extensions.meta
  58. 1 1
      Assets/AppleSignInUnity/AppleAuth/Extensions/AppleErrorExtensions.cs.meta
  59. 2 2
      Assets/AppleSignInUnity/AppleAuth/Extensions/PersonNameExtensions.cs
  60. 1 1
      Assets/AppleSignInUnity/AppleAuth/Extensions/PersonNameExtensions.cs.meta
  61. 1 1
      Assets/AppleSignInUnity/AppleAuth/IAppleAuthManager.cs.meta
  62. 1 1
      Assets/AppleSignInUnity/AppleAuth/Interfaces.meta
  63. 1 1
      Assets/AppleSignInUnity/AppleAuth/Interfaces/IAppleError.cs.meta
  64. 1 1
      Assets/AppleSignInUnity/AppleAuth/Interfaces/IAppleIDCredential.cs.meta
  65. 1 1
      Assets/AppleSignInUnity/AppleAuth/Interfaces/ICredential.cs.meta
  66. 1 1
      Assets/AppleSignInUnity/AppleAuth/Interfaces/ICredentialStateResponse.cs.meta
  67. 1 1
      Assets/AppleSignInUnity/AppleAuth/Interfaces/ILoginWithAppleIdResponse.cs.meta
  68. 1 1
      Assets/AppleSignInUnity/AppleAuth/Interfaces/IPasswordCredential.cs.meta
  69. 1 1
      Assets/AppleSignInUnity/AppleAuth/Interfaces/IPayloadDeserializer.cs.meta
  70. 1 1
      Assets/AppleSignInUnity/AppleAuth/Interfaces/IPersonName.cs.meta
  71. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native.meta
  72. 5 0
      Assets/AppleSignInUnity/AppleAuth/Native/AppleError.cs
  73. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native/AppleError.cs.meta
  74. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native/AppleIDCredential.cs.meta
  75. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native/CredentialStateResponse.cs.meta
  76. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native/FullPersonName.cs.meta
  77. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native/LoginWithAppleIdResponse.cs.meta
  78. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native/PasswordCredential.cs.meta
  79. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native/PayloadDeserializer.cs.meta
  80. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native/PersonName.cs.meta
  81. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native/SerializationTools.cs.meta
  82. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native/iOS.meta
  83. 55 2
      Assets/AppleSignInUnity/AppleAuth/Native/iOS/AppleAuthManager.h.meta
  84. 16 15
      Assets/AppleSignInUnity/AppleAuth/Native/iOS/AppleAuthManager.m
  85. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native/iOS/AppleAuthManager.m.meta
  86. 9 9
      Assets/AppleSignInUnity/AppleAuth/Native/iOS/AppleAuthSerializer.h
  87. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native/iOS/AppleAuthSerializer.h.meta
  88. 4 4
      Assets/AppleSignInUnity/AppleAuth/Native/iOS/AppleAuthSerializer.m
  89. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native/iOS/AppleAuthSerializer.m.meta
  90. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native/iOS/PersonNameComponentsFormatting.m
  91. 1 1
      Assets/AppleSignInUnity/AppleAuth/Native/iOS/PersonNameComponentsFormatting.m.meta
  92. 2 2
      Assets/AppleSignInUnity/AppleAuth/package.json
  93. 1 1
      Assets/AppleSignInUnity/AppleAuth/package.json.meta
  94. 1 35
      Assets/AppleSignInUnity/AppleAuthSample/GameMenuHandler.cs
  95. 117 67
      Assets/AppleSignInUnity/AppleAuthSample/LandscapeSampleScene.unity
  96. 64 0
      Assets/AppleSignInUnity/AppleAuthSample/LandscapeSampleSceneSettings.lighting
  97. 1 1
      Assets/AppleSignInUnity/AppleAuthSample/LandscapeSampleSceneSettings.lighting.meta
  98. 18 174
      Assets/AppleSignInUnity/AppleAuthSample/MainMenu.cs
  99. 16 446
      Assets/AppleSignInUnity/AppleAuthSample/SampleScene.unity
  100. 0 63
      Assets/BowArrow/DebugShoot/BluetoothClient.cs

+ 1 - 1
Assets/BowArrow/DebugShoot.meta → Assets/AddressableAssetsData.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f079eefb09a7302449db8387e82be785
+guid: 45ed5cc14336b5b418714c168dcf6193
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 136 - 0
Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -0,0 +1,136 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 468a46d0ae32c3544b7d98094e6448a9, type: 3}
+  m_Name: AddressableAssetSettings
+  m_EditorClassIdentifier: 
+  m_DefaultGroup: a05bbd0806036e54c9779184721ad741
+  m_CachedHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_OptimizeCatalogSize: 0
+  m_BuildRemoteCatalog: 0
+  m_BundleLocalCatalog: 0
+  m_CatalogRequestsTimeout: 0
+  m_DisableCatalogUpdateOnStart: 0
+  m_IgnoreUnsupportedFilesInBuild: 0
+  m_UniqueBundleIds: 0
+  m_NonRecursiveBuilding: 1
+  m_CCDEnabled: 0
+  m_maxConcurrentWebRequests: 500
+  m_ContiguousBundles: 1
+  m_StripUnityVersionFromBundleBuild: 0
+  m_DisableVisibleSubAssetRepresentations: 0
+  m_ShaderBundleNaming: 0
+  m_ShaderBundleCustomNaming: 
+  m_MonoScriptBundleNaming: 0
+  m_MonoScriptBundleCustomNaming: 
+  m_RemoteCatalogBuildPath:
+    m_Id: 
+  m_RemoteCatalogLoadPath:
+    m_Id: 
+  m_ContentStateBuildPath: 
+  m_BuildAddressablesWithPlayerBuild: 0
+  m_overridePlayerVersion: 
+  m_GroupAssets:
+  - {fileID: 11400000, guid: 1c3efe1c3ea7ac74592e9b6cda0b7eea, type: 2}
+  - {fileID: 11400000, guid: d939d362aa615af4a80ebb7addecc3c0, type: 2}
+  - {fileID: 11400000, guid: 7ffc596730379b140be42b89b043cb3a, type: 2}
+  m_BuildSettings:
+    m_CompileScriptsInVirtualMode: 0
+    m_CleanupStreamingAssetsAfterBuilds: 1
+    m_LogResourceManagerExceptions: 1
+    m_BundleBuildPath: Temp/com.unity.addressables/AssetBundles
+  m_ProfileSettings:
+    m_Profiles:
+    - m_InheritedParent: 
+      m_Id: 660f9434e9c8bd340abd9c83ddb19caa
+      m_ProfileName: Default
+      m_Values:
+      - m_Id: da76aaeead6fdf849b92080d9c25d2de
+        m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
+      - m_Id: 515ba9cb3af7f224086fee63f6b39a33
+        m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
+      - m_Id: 4a2d8366a1943894ab9af160cc87eb30
+        m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
+      - m_Id: faaff44f7da8a404898af142e0cfb794
+        m_Value: ServerData/[BuildTarget]
+      - m_Id: 9acd7af12b77cda48a2d1109cbf5224c
+        m_Value: http://[PrivateIpAddress]:[HostingServicePort]
+    - m_InheritedParent: 
+      m_Id: c11e83ba7492b0440b2902ecc2550a82
+      m_ProfileName: iPhone_Profile
+      m_Values:
+      - m_Id: da76aaeead6fdf849b92080d9c25d2de
+        m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
+      - m_Id: 515ba9cb3af7f224086fee63f6b39a33
+        m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
+      - m_Id: 4a2d8366a1943894ab9af160cc87eb30
+        m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
+      - m_Id: faaff44f7da8a404898af142e0cfb794
+        m_Value: ServerData/[BuildTarget]
+      - m_Id: 9acd7af12b77cda48a2d1109cbf5224c
+        m_Value: http://[PrivateIpAddress]:[HostingServicePort]
+    - m_InheritedParent: 
+      m_Id: 80b0a7e5cf87c0249a4b8c1fd3fd4abc
+      m_ProfileName: iPad_Profile
+      m_Values:
+      - m_Id: da76aaeead6fdf849b92080d9c25d2de
+        m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
+      - m_Id: 515ba9cb3af7f224086fee63f6b39a33
+        m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
+      - m_Id: 4a2d8366a1943894ab9af160cc87eb30
+        m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
+      - m_Id: faaff44f7da8a404898af142e0cfb794
+        m_Value: ServerData/[BuildTarget]
+      - m_Id: 9acd7af12b77cda48a2d1109cbf5224c
+        m_Value: http://[PrivateIpAddress]:[HostingServicePort]
+    m_ProfileEntryNames:
+    - m_Id: da76aaeead6fdf849b92080d9c25d2de
+      m_Name: BuildTarget
+      m_InlineUsage: 0
+    - m_Id: 515ba9cb3af7f224086fee63f6b39a33
+      m_Name: Local.BuildPath
+      m_InlineUsage: 0
+    - m_Id: 4a2d8366a1943894ab9af160cc87eb30
+      m_Name: Local.LoadPath
+      m_InlineUsage: 0
+    - m_Id: faaff44f7da8a404898af142e0cfb794
+      m_Name: Remote.BuildPath
+      m_InlineUsage: 0
+    - m_Id: 9acd7af12b77cda48a2d1109cbf5224c
+      m_Name: Remote.LoadPath
+      m_InlineUsage: 0
+    m_ProfileVersion: 1
+  m_LabelTable:
+    m_LabelNames:
+    - default
+    - iPhone
+    - iPad
+  m_SchemaTemplates: []
+  m_GroupTemplateObjects:
+  - {fileID: 11400000, guid: c1b3aeb59125ce74e8495205be03a70e, type: 2}
+  m_InitializationObjects: []
+  m_CertificateHandlerType:
+    m_AssemblyName: 
+    m_ClassName: 
+  m_ActivePlayerDataBuilderIndex: 3
+  m_DataBuilders:
+  - {fileID: 11400000, guid: 008d7e350676ba541bc013e212dae85d, type: 2}
+  - {fileID: 11400000, guid: e631e71e6622d7f4592d070f5083631f, type: 2}
+  - {fileID: 11400000, guid: 3e4ffd30a8aa0ea459d188ce273e1ae0, type: 2}
+  - {fileID: 11400000, guid: c70040eafb48b1f4db76577bd838d471, type: 2}
+  m_ActiveProfileId: 660f9434e9c8bd340abd9c83ddb19caa
+  m_HostingServicesManager:
+    m_HostingServiceInfos: []
+    m_Settings: {fileID: 11400000}
+    m_NextInstanceId: 0
+    m_RegisteredServiceTypeRefs: []

+ 2 - 2
Assets/BowArrow/Scenes/GameChallengeScene/场景备份/GameChallengeTerrain 1.asset.meta → Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: b8f6471351a2daa40b672d6c5a54544c
+guid: bd4aee83274041848a614d70134e40ee
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 15600000
+  mainObjectFileID: 11400000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/MagInterferenceTip.meta → Assets/AddressableAssetsData/AssetGroupTemplates.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2da99057d57567142995ea0ffe6348e2
+guid: 848017f325004934baacb50874eaa6d3
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 76 - 0
Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset

@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1525918746319802696
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
+  m_Name: BundledAssetGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 0}
+  m_InternalBundleIdMode: 1
+  m_Compression: 1
+  m_IncludeAddressInCatalog: 1
+  m_IncludeGUIDInCatalog: 1
+  m_IncludeLabelsInCatalog: 1
+  m_InternalIdNamingMode: 0
+  m_CacheClearBehavior: 0
+  m_IncludeInBuild: 1
+  m_BundledAssetProviderType:
+    m_AssemblyName: 
+    m_ClassName: 
+  m_ForceUniqueProvider: 0
+  m_UseAssetBundleCache: 1
+  m_UseAssetBundleCrc: 1
+  m_UseAssetBundleCrcForCachedBundles: 1
+  m_UseUWRForLocalBundles: 0
+  m_Timeout: 0
+  m_ChunkedTransfer: 0
+  m_RedirectLimit: -1
+  m_RetryCount: 0
+  m_BuildPath:
+    m_Id: 
+  m_LoadPath:
+    m_Id: 
+  m_BundleMode: 0
+  m_AssetBundleProviderType:
+    m_AssemblyName: 
+    m_ClassName: 
+  m_BundleNaming: 0
+  m_AssetLoadMode: 0
+--- !u!114 &-925333244780370168
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
+  m_Name: ContentUpdateGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 0}
+  m_StaticContent: 0
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1a3c5d64ac83548c09dd1678b9f6f1cd, type: 3}
+  m_Name: Packed Assets
+  m_EditorClassIdentifier: 
+  m_SchemaObjects:
+  - {fileID: -1525918746319802696}
+  - {fileID: -925333244780370168}
+  m_Description: Pack assets into asset bundles.
+  m_Settings: {fileID: 0}

+ 2 - 2
Assets/BowArrow/test-ellipse/White.mat.meta → Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 60f820932c627624e876497802e0423e
+guid: c1b3aeb59125ce74e8495205be03a70e
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 2100000
+  mainObjectFileID: 11400000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/BowArrow/Scenes/GameChallengeScene/场景备份.meta → Assets/AddressableAssetsData/AssetGroups.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2c57317627a47ed498d471379dc6229f
+guid: 65114fef75e0be14da9b9900c426279f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 32 - 0
Assets/AddressableAssetsData/AssetGroups/Built In Data.asset

@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: Built In Data
+  m_EditorClassIdentifier: 
+  m_GroupName: Built In Data
+  m_Data:
+    m_SerializedData: []
+  m_GUID: 8be9cb065ac12a6448a06da031983dec
+  m_SerializeEntries:
+  - m_GUID: Resources
+    m_Address: Resources
+    m_ReadOnly: 1
+    m_SerializedLabels: []
+  - m_GUID: EditorSceneList
+    m_Address: EditorSceneList
+    m_ReadOnly: 1
+    m_SerializedLabels: []
+  m_ReadOnly: 1
+  m_Settings: {fileID: 11400000, guid: bd4aee83274041848a614d70134e40ee, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: 749a60b6e7404fa4c81ce356fc80b3ee, type: 2}

+ 2 - 2
Assets/BowArrow/test-ellipse/Yellow.mat.meta → Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 9c0a769128c0d3b48b2501f6d7e4dbf7
+guid: 1c3efe1c3ea7ac74592e9b6cda0b7eea
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 2100000
+  mainObjectFileID: 11400000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 25 - 0
Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset

@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: Default Local Group
+  m_EditorClassIdentifier: 
+  m_GroupName: Default Local Group
+  m_Data:
+    m_SerializedData: []
+  m_GUID: a05bbd0806036e54c9779184721ad741
+  m_SerializeEntries: []
+  m_ReadOnly: 0
+  m_Settings: {fileID: 11400000, guid: bd4aee83274041848a614d70134e40ee, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: 130b82026403030448c3345ce84d077e, type: 2}
+    - {fileID: 11400000, guid: ec768f583ce31764d8c6188ecc46dd61, type: 2}

+ 8 - 0
Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d939d362aa615af4a80ebb7addecc3c0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/BowArrow/Scripts/Bluetooth/New.meta → Assets/AddressableAssetsData/AssetGroups/Schemas.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 572ae60186cda0943b4bf01f20e53552
+guid: e072fe40dde50e7428286aa6b584e9ee
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 17 - 0
Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b1487f5d688e4f94f828f879d599dbdc, type: 3}
+  m_Name: Built In Data_PlayerDataGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 1c3efe1c3ea7ac74592e9b6cda0b7eea, type: 2}
+  m_IncludeResourcesFolders: 1
+  m_IncludeBuildSettingsScenes: 1

+ 8 - 0
Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 749a60b6e7404fa4c81ce356fc80b3ee
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 45 - 0
Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset

@@ -0,0 +1,45 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
+  m_Name: Default Local Group_BundledAssetGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: d939d362aa615af4a80ebb7addecc3c0, type: 2}
+  m_InternalBundleIdMode: 1
+  m_Compression: 1
+  m_IncludeAddressInCatalog: 1
+  m_IncludeGUIDInCatalog: 1
+  m_IncludeLabelsInCatalog: 1
+  m_InternalIdNamingMode: 0
+  m_CacheClearBehavior: 0
+  m_IncludeInBuild: 1
+  m_BundledAssetProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
+  m_ForceUniqueProvider: 0
+  m_UseAssetBundleCache: 1
+  m_UseAssetBundleCrc: 1
+  m_UseAssetBundleCrcForCachedBundles: 1
+  m_UseUWRForLocalBundles: 0
+  m_Timeout: 0
+  m_ChunkedTransfer: 0
+  m_RedirectLimit: -1
+  m_RetryCount: 0
+  m_BuildPath:
+    m_Id: 515ba9cb3af7f224086fee63f6b39a33
+  m_LoadPath:
+    m_Id: 4a2d8366a1943894ab9af160cc87eb30
+  m_BundleMode: 0
+  m_AssetBundleProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
+  m_BundleNaming: 0
+  m_AssetLoadMode: 0

+ 8 - 0
Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ec768f583ce31764d8c6188ecc46dd61
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 16 - 0
Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
+  m_Name: Default Local Group_ContentUpdateGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: d939d362aa615af4a80ebb7addecc3c0, type: 2}
+  m_StaticContent: 0

+ 8 - 0
Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 130b82026403030448c3345ce84d077e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 45 - 0
Assets/AddressableAssetsData/AssetGroups/Schemas/Textures_BundledAssetGroupSchema.asset

@@ -0,0 +1,45 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
+  m_Name: Textures_BundledAssetGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 7ffc596730379b140be42b89b043cb3a, type: 2}
+  m_InternalBundleIdMode: 1
+  m_Compression: 1
+  m_IncludeAddressInCatalog: 1
+  m_IncludeGUIDInCatalog: 1
+  m_IncludeLabelsInCatalog: 1
+  m_InternalIdNamingMode: 0
+  m_CacheClearBehavior: 0
+  m_IncludeInBuild: 1
+  m_BundledAssetProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
+  m_ForceUniqueProvider: 0
+  m_UseAssetBundleCache: 1
+  m_UseAssetBundleCrc: 1
+  m_UseAssetBundleCrcForCachedBundles: 1
+  m_UseUWRForLocalBundles: 0
+  m_Timeout: 0
+  m_ChunkedTransfer: 0
+  m_RedirectLimit: -1
+  m_RetryCount: 0
+  m_BuildPath:
+    m_Id: 515ba9cb3af7f224086fee63f6b39a33
+  m_LoadPath:
+    m_Id: 4a2d8366a1943894ab9af160cc87eb30
+  m_BundleMode: 0
+  m_AssetBundleProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
+  m_BundleNaming: 0
+  m_AssetLoadMode: 0

+ 8 - 0
Assets/AddressableAssetsData/AssetGroups/Schemas/Textures_BundledAssetGroupSchema.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fe2b8e75f5e41bf44b4d681f42c67204
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 16 - 0
Assets/AddressableAssetsData/AssetGroups/Schemas/Textures_ContentUpdateGroupSchema.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
+  m_Name: Textures_ContentUpdateGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 7ffc596730379b140be42b89b043cb3a, type: 2}
+  m_StaticContent: 0

+ 8 - 0
Assets/AddressableAssetsData/AssetGroups/Schemas/Textures_ContentUpdateGroupSchema.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 84ded5d4bd698f245a33c11519f85daf
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 25 - 0
Assets/AddressableAssetsData/AssetGroups/Textures.asset

@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: Textures
+  m_EditorClassIdentifier: 
+  m_GroupName: Textures
+  m_Data:
+    m_SerializedData: []
+  m_GUID: 7856a83aaf934fe4e960676dd78b4def
+  m_SerializeEntries: []
+  m_ReadOnly: 0
+  m_Settings: {fileID: 11400000, guid: bd4aee83274041848a614d70134e40ee, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: fe2b8e75f5e41bf44b4d681f42c67204, type: 2}
+    - {fileID: 11400000, guid: 84ded5d4bd698f245a33c11519f85daf, type: 2}

+ 8 - 0
Assets/AddressableAssetsData/AssetGroups/Textures.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7ffc596730379b140be42b89b043cb3a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/AddressableAssetsData/DataBuilders.meta

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

+ 20 - 0
Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset

@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 88d21199f5d473f4db36845f2318f180, type: 3}
+  m_Name: BuildScriptFastMode
+  m_EditorClassIdentifier: 
+  instanceProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider
+  sceneProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider

+ 8 - 0
Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 008d7e350676ba541bc013e212dae85d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 20 - 0
Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset

@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3e2e0ffa088c91d41a086d0b8cb16bdc, type: 3}
+  m_Name: BuildScriptPackedMode
+  m_EditorClassIdentifier: 
+  instanceProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider
+  sceneProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider

+ 8 - 0
Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c70040eafb48b1f4db76577bd838d471
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 20 - 0
Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset

@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ad8c280d42ee0ed41a27db23b43dd2bf, type: 3}
+  m_Name: BuildScriptPackedPlayMode
+  m_EditorClassIdentifier: 
+  instanceProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider
+  sceneProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider

+ 8 - 0
Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3e4ffd30a8aa0ea459d188ce273e1ae0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 20 - 0
Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset

@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bb0e4994b34add1409fd8ccaf4a82de5, type: 3}
+  m_Name: BuildScriptVirtualMode
+  m_EditorClassIdentifier: 
+  instanceProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider
+  sceneProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider

+ 8 - 0
Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e631e71e6622d7f4592d070f5083631f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
Assets/AddressableAssetsData/DefaultObject.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a189bb168d8d90478a09ea08c2f3d72, type: 3}
+  m_Name: DefaultObject
+  m_EditorClassIdentifier: 
+  m_AddressableAssetSettingsGuid: bd4aee83274041848a614d70134e40ee

+ 8 - 0
Assets/AddressableAssetsData/DefaultObject.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1d28dd5f0f163024dbabfb48b490e107
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 27 - 0
Assets/AddressableAssetsData/ProfileDataSourceSettings.asset

@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e3976da977cb49238499ea3b4c237ae, type: 3}
+  m_Name: ProfileDataSourceSettings
+  m_EditorClassIdentifier: 
+  profileGroupTypes:
+  - m_GroupTypePrefix: Built-In
+    m_Variables:
+    - m_Suffix: BuildPath
+      m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
+    - m_Suffix: LoadPath
+      m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
+  - m_GroupTypePrefix: Editor Hosted
+    m_Variables:
+    - m_Suffix: BuildPath
+      m_Value: ServerData/[BuildTarget]
+    - m_Suffix: LoadPath
+      m_Value: http://[PrivateIpAddress]:[HostingServicePort]

+ 8 - 0
Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2dcd2115f2b020645b8d65ff0d0973ff
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/AddressableAssetsData/iOS.meta

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

BIN
Assets/AddressableAssetsData/iOS/addressables_content_state.bin


+ 1 - 1
Assets/BowArrow/Scenes/Test.unity.meta → Assets/AddressableAssetsData/iOS/addressables_content_state.bin.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 14f136990a82f0042aae1edcec1f03a2
+guid: 2b8589bce6384044db8045e93aae7b90
 DefaultImporter:
   externalObjects: {}
   userData: 

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/AppleAuth.asmdef.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 18299ae3367e54facaf234d6fdef478c
+guid: f0f7271028ac7491e8071ca74839ec94
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/AppleAuthLoginArgs.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3b73c35a1b9cc46c4aee8b7ef42a8d16
+guid: 942d45185ed014f85860ee7e09cc0b20
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 3
Assets/AppleSignInUnity/AppleAuth/AppleAuthManager.cs

@@ -1,4 +1,4 @@
-#if ((UNITY_IOS || UNITY_TVOS || UNITY_STANDALONE_OSX) && !UNITY_EDITOR)
+#if ((UNITY_IOS || UNITY_TVOS || UNITY_VISIONOS || UNITY_STANDALONE_OSX) && !UNITY_EDITOR)
 #define APPLE_AUTH_MANAGER_NATIVE_IMPLEMENTATION_AVAILABLE
 #endif
 
@@ -12,7 +12,7 @@ namespace AppleAuth
     {
         static AppleAuthManager()
         {
-            const string versionMessage = "Using Sign in with Apple Unity Plugin - v1.4.2";
+            const string versionMessage = "Using Sign in with Apple Unity Plugin - v1.4.4";
 #if APPLE_AUTH_MANAGER_NATIVE_IMPLEMENTATION_AVAILABLE
             PInvoke.AppleAuth_LogMessage(versionMessage);
 #else
@@ -289,7 +289,7 @@ namespace AppleAuth
 
         private static class PInvoke
         {
-#if UNITY_IOS || UNITY_TVOS
+#if UNITY_IOS || UNITY_TVOS || UNITY_VISIONOS
             private const string DllName = "__Internal";
 #elif UNITY_STANDALONE_OSX
             private const string DllName = "MacOSAppleAuthManager";

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/AppleAuthManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4c7f839cf27df4e2daf0b30aaecca941
+guid: 8f1c9ac38c36d41b5b3cee996dc6ac3f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/AppleAuthQuickLoginArgs.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 880aaf66cd239420c84516df3808b1cd
+guid: 99b1f818af264456ea20929dd72afbb7
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Editor.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9d2fa333a77c745fe8752ca94d41779f
+guid: ee5509fe0595343989be434d5c3a74a8
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Editor/AppleAuth.Editor.asmdef.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1c91b2bcb0fb84a7097f5062974c1431
+guid: f1e90a31043bd4ee5a222b0cc88d9836
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Editor/AppleAuthMacosPostprocessorHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c63f43437574c466590bb388a8fcbcde
+guid: 65ea61def166544ca86e7e9cbc0b6e04
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 57 - 37
Assets/AppleSignInUnity/AppleAuth/Editor/ProjectCapabilityManagerExtension.cs

@@ -1,4 +1,4 @@
-#if UNITY_IOS || UNITY_TVOS
+#if UNITY_IOS || UNITY_TVOS || UNITY_VISIONOS
 
 using System;
 using System.Reflection;
@@ -8,61 +8,81 @@ namespace AppleAuth.Editor
 {
     public static class ProjectCapabilityManagerExtension
     {
-        private const string EntitlementsArrayKey = "com.apple.developer.applesignin";
-        private const string DefaultAccessLevel = "Default";
-        private const string AuthenticationServicesFramework = "AuthenticationServices.framework";
-        private const BindingFlags NonPublicInstanceBinding = BindingFlags.NonPublic | BindingFlags.Instance;
-
         /// <summary>
         /// Extension method for ProjectCapabilityManager to add the Sign In With Apple capability in compatibility mode.
         /// In particular, adds the AuthenticationServices.framework as an Optional framework, preventing crashes in
         /// iOS versions previous to 13.0
         /// </summary>
         /// <param name="manager">The manager for the main target to use when adding the Sign In With Apple capability.</param>
-        /// <param name="unityFrameworkTargetGuid">The GUID for the UnityFramework target. If null, it will use the main target GUID.</param>
-        public static void AddSignInWithAppleWithCompatibility(this ProjectCapabilityManager manager, string unityFrameworkTargetGuid = null)
+        public static void AddSignInWithAppleWithCompatibility(this ProjectCapabilityManager manager)
         {
+            const BindingFlags bindingFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
             var managerType = typeof(ProjectCapabilityManager);
-            var capabilityTypeType = typeof(PBXCapabilityType);
-            
-            var projectField = managerType.GetField("project", NonPublicInstanceBinding);
-            var targetGuidField = managerType.GetField("m_TargetGuid", NonPublicInstanceBinding);
-            var entitlementFilePathField = managerType.GetField("m_EntitlementFilePath", NonPublicInstanceBinding);
-            var getOrCreateEntitlementDocMethod = managerType.GetMethod("GetOrCreateEntitlementDoc", NonPublicInstanceBinding);
-            var constructorInfo = capabilityTypeType.GetConstructor(
-                NonPublicInstanceBinding, 
-                null,
-                new[] {typeof(string), typeof(bool), typeof(string), typeof(bool)}, 
-                null);
             
-            if (projectField == null || targetGuidField == null  || entitlementFilePathField == null ||
-                getOrCreateEntitlementDocMethod == null || constructorInfo == null)
-                throw new Exception("Can't Add Sign In With Apple programatically in this Unity version");
+            var projectField = managerType.GetField("project", bindingFlags);
+            var entitlementFilePathField = managerType.GetField("m_EntitlementFilePath", bindingFlags);
+            var targetGuidField = managerType.GetField("m_TargetGuid", bindingFlags);
+            var getOrCreateEntitlementDocMethod = managerType.GetMethod("GetOrCreateEntitlementDoc", bindingFlags);
+            if (projectField == null ||
+                entitlementFilePathField == null ||
+                targetGuidField == null ||
+                getOrCreateEntitlementDocMethod == null)
+                throw new Exception("Can't Add Sign In With Apple programatically in this Unity version.");
             
             var entitlementFilePath = entitlementFilePathField.GetValue(manager) as string;
-            var entitlementDoc = getOrCreateEntitlementDocMethod.Invoke(manager, new object[] { }) as PlistDocument;
+            var entitlementDoc = (PlistDocument) getOrCreateEntitlementDocMethod.Invoke(manager, new object[] { });
             if (entitlementDoc != null)
             {
                 var plistArray = new PlistElementArray();
-                plistArray.AddString(DefaultAccessLevel);
-                entitlementDoc.root[EntitlementsArrayKey] = plistArray;
+                plistArray.AddString("Default");
+                entitlementDoc.root["com.apple.developer.applesignin"] = plistArray;
             }
 
-            var project = projectField.GetValue(manager) as PBXProject;
-            if (project != null)
-            {
-                var mainTargetGuid = targetGuidField.GetValue(manager) as string;
-                var capabilityType = constructorInfo.Invoke(new object[] { "com.apple.developer.applesignin.custom", true, string.Empty, true }) as PBXCapabilityType;
+            var project = (PBXProject) projectField.GetValue(manager);
+            var emptyCapability = GetEmptyCapabilityWithReflection();
+            
+            var mainTargetGuid = (string)targetGuidField.GetValue(manager);
+#if UNITY_2019_3_OR_NEWER
+            var frameworkTargetGuid = project.GetUnityFrameworkTargetGuid();
+#else
+            var frameworkTargetGuid = mainTargetGuid;
+#endif
+            
+            project.AddFrameworkToProject(frameworkTargetGuid, "AuthenticationServices.framework", true);
+            project.AddCapability(mainTargetGuid, emptyCapability, entitlementFilePath);
+        }
+        
+        private static PBXCapabilityType GetEmptyCapabilityWithReflection()
+        {
+            // For Unity version >= 6000.0.23f1
+            var constructorInfo = typeof(PBXCapabilityType)
+                .GetConstructor(
+                    BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance, 
+                    null, 
+                    new[] {typeof(bool), typeof(string), typeof(bool)}, 
+                    null);
 
-                var targetGuidToAddFramework = unityFrameworkTargetGuid;
-                if (targetGuidToAddFramework == null)
-                {
-                    targetGuidToAddFramework = mainTargetGuid;
-                }
+            if (constructorInfo != null)
+            {
+                return (PBXCapabilityType) constructorInfo
+                    .Invoke(new object[] {true, string.Empty, true});
+            }
+            
+            // For Unity version < 6000.0.23f1
+            constructorInfo = typeof(PBXCapabilityType)
+                .GetConstructor(
+                    BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance, 
+                    null, 
+                    new[] {typeof(string), typeof(bool), typeof(string), typeof(bool)}, 
+                    null);
 
-                project.AddFrameworkToProject(targetGuidToAddFramework, AuthenticationServicesFramework, true);
-                project.AddCapability(mainTargetGuid, capabilityType, entitlementFilePath, false);
+            if (constructorInfo != null)
+            {
+                return (PBXCapabilityType) constructorInfo
+                    .Invoke(new object[] {"com.lupidan.apple-signin-unity.empty", true, string.Empty, true});
             }
+
+            throw new Exception("Can't create empty capability in this Unity version.");
         }
     }
 }

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Editor/ProjectCapabilityManagerExtension.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 78dac5699abb64d9fac79a0c86935222
+guid: 05c113d121f2c436ea9949b66c6dbae3
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Enums.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 932abca36e8644290a74701cbd118268
+guid: 2f261eb86ba734feca161c2f37a6e0fd
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Enums/AuthorizationErrorCode.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 94ed713aefbcb4ad4af09134940b6e6a
+guid: ba35f129575e343abbaf8e8e4fe387d5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Enums/CredentialState.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 676a23062a9d949208d65b358409bea3
+guid: 64d60ba659f914e9d8e63b7c9994c325
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Enums/LoginOptions.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fdb929423ec104623a3063907d6225c7
+guid: 08355c5c3f39b4ba399feeae4682c757
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Enums/PersonNameFormatterStyle.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e1f1c2ec40fe841078e00f863f1d423f
+guid: b1d984d066d6148e2a3c4cb8cf5a0f6d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Enums/RealUserStatus.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 825807bd1c07d453793cb31245989cb7
+guid: c109c8d1cbdd148a2b42b34a7fcc2425
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Extensions.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e1c9a1626aa114777a15f069a203fda4
+guid: 46ae81adc8aa44e699353b9d9905efe7
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Extensions/AppleErrorExtensions.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 38ba8067d45904561992442829c81621
+guid: ee019489d69e149e69b06ccb21b0dd64
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 2 - 2
Assets/AppleSignInUnity/AppleAuth/Extensions/PersonNameExtensions.cs

@@ -1,4 +1,4 @@
-#if ((UNITY_IOS || UNITY_TVOS || UNITY_STANDALONE_OSX) && !UNITY_EDITOR)
+#if ((UNITY_IOS || UNITY_TVOS || UNITY_VISIONOS || UNITY_STANDALONE_OSX) && !UNITY_EDITOR)
 #define NATIVE_PERSON_NAME_COMPONENTS_AVAILABLE
 #endif
 
@@ -77,7 +77,7 @@ namespace AppleAuth.Extensions
         
         private static class PInvoke
         {
-#if UNITY_IOS || UNITY_TVOS
+#if UNITY_IOS || UNITY_TVOS || UNITY_VISIONOS
             private const string DllName = "__Internal";
 #elif UNITY_STANDALONE_OSX
             private const string DllName = "MacOSAppleAuthManager";

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Extensions/PersonNameExtensions.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0f0ce3be3f3d14936b66e17aeca1270d
+guid: 50a93c68971744766bec2462c301927e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/IAppleAuthManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8bab6e87f1e5b4a38a372f0346cda176
+guid: 32e1611c500594c25bdb8061c251076a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Interfaces.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b4573b7b8e1474ab29d1b894d0f02787
+guid: 173fddc6bf46743bdbf40c1cd54ff4ce
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Interfaces/IAppleError.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5a866a07171f248c3ad143c36aa83d0a
+guid: 3929dbc055ed14b1a896cc4c67b423c8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Interfaces/IAppleIDCredential.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5dd53646adf034cea90d0ecf78712394
+guid: b817603261dd2493794589b3fd458466
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Interfaces/ICredential.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5d586788ca6134d548a7cc5ee754e20a
+guid: 3375c07071b6d4ab993282abe5a574de
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Interfaces/ICredentialStateResponse.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 04bbc9a18c17a4bd7a108ba1bfec7965
+guid: 9572e57440d98452a82c48632f7e8deb
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Interfaces/ILoginWithAppleIdResponse.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bec39bc93cefb4208a473599c4bab5a8
+guid: 0871a2e919f004f7a9351346ef4a4a80
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Interfaces/IPasswordCredential.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 66bf942456541410f8647591a733b7a4
+guid: 460c69af0ca3e49d3830ab4d9f337f6a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Interfaces/IPayloadDeserializer.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: afdcdd284f56342368cbbb6058506522
+guid: ac6883326639942c4b152261b2649784
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Interfaces/IPersonName.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 03a0cb4a41a6e43aea5b76da524b1936
+guid: bf0076b2271ed4a4dbc2c43f5c5cf9fd
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0b4db2f18400848a1870f020c35193c3
+guid: d7ae4752b928143e9b8d8396e8ee5f7c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 5 - 0
Assets/AppleSignInUnity/AppleAuth/Native/AppleError.cs

@@ -32,5 +32,10 @@ namespace AppleAuth.Native
             
             SerializationTools.FixSerializationForArray(ref this._localizedRecoveryOptions);
         }
+
+        public override string ToString()
+        {
+            return $"Domain={_domain} Code={_code} Description={_localizedDescription}";
+        }
     }
 }

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native/AppleError.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 972dbd5260990433088a91447f9b5996
+guid: 328bc30fa27f54dcc90fbd80e72b9cfb
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native/AppleIDCredential.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 15f1c0e85148148df9c73c1bd394ad0b
+guid: 466c0624e95f44a9c88b8bdfd929cab0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native/CredentialStateResponse.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9b612635356cd461a9e2534b4a3b319c
+guid: 9503865ba21114da4a14b55abed95465
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native/FullPersonName.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 553939a7cdc8345438ef7c4acd6df81b
+guid: ceeacae8e47c24121af136939edfea56
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native/LoginWithAppleIdResponse.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5424178463c904f64a35b217a67ca26d
+guid: 59b9a0165d48d4a34b04ba6472db9a6e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native/PasswordCredential.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8f9622fd2a2624b309ef315aee546084
+guid: 5244f103d85c64b3cb440ff15bc75ff2
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native/PayloadDeserializer.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7e11d92c61c294843bda2eac40302df7
+guid: 2526470d9dc4e4c1d95bce90a54084c4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native/PersonName.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 59d79ab039edf4a8a9e67de450c3e677
+guid: 7910ffff99e494b2fb97ff13169e0bb8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native/SerializationTools.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 61681e44feb1b43a8ae7b1afdcb3113f
+guid: 997d9975ced8a404abc25b6a2cbe3866
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native/iOS.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 88d4fb72126254913917272059676859
+guid: 54498cbbbee9249ef82cd1cf6039fd31
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 55 - 2
Assets/AppleSignInUnity/AppleAuth/Native/iOS/AppleAuthManager.h.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 11e16916ddef24a22b24c934116b75df
+guid: bc76c5dc90c84411784d9ce360740a53
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
@@ -11,6 +11,24 @@ PluginImporter:
   isExplicitlyReferenced: 0
   validateReferences: 1
   platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 0
+        Exclude Linux64: 0
+        Exclude OSXUniversal: 0
+        Exclude Win: 0
+        Exclude Win64: 0
+        Exclude iOS: 0
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARMv7
   - first:
       Any: 
     second:
@@ -19,9 +37,44 @@ PluginImporter:
   - first:
       Editor: Editor
     second:
-      enabled: 0
+      enabled: 1
       settings:
+        CPU: AnyCPU
         DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings:
+        AddToEmbeddedBinaries: false
+        CPU: AnyCPU
+        CompileFlags: 
+        FrameworkDependencies: AuthenticationServices;
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 16 - 15
Assets/AppleSignInUnity/AppleAuth/Native/iOS/AppleAuthManager.m

@@ -27,8 +27,8 @@
 
 #pragma mark - AppleAuthManager Implementation
 
-// IOS/TVOS 13.0 | MACOS 10.15
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 || __TV_OS_VERSION_MAX_ALLOWED >= 130000 || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
+// IOS/TVOS 13.0 | MACOS 10.15 | VISIONOS 1.0
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 || __TV_OS_VERSION_MAX_ALLOWED >= 130000 || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500 || __VISION_OS_VERSION_MAX_ALLOWED >= 10000
 #define AUTHENTICATION_SERVICES_AVAILABLE true
 #import <AuthenticationServices/AuthenticationServices.h>
 #endif
@@ -45,7 +45,7 @@
 @end
 
 #if AUTHENTICATION_SERVICES_AVAILABLE
-API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0))
+API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0), visionos(1.0))
 @interface AppleAuthManager () <ASAuthorizationControllerDelegate, ASAuthorizationControllerPresentationContextProviding>
 @property (nonatomic, strong) ASAuthorizationAppleIDProvider *appleIdProvider;
 @property (nonatomic, strong) ASAuthorizationPasswordProvider *passwordProvider;
@@ -74,7 +74,7 @@ API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0))
     if (self)
     {
 #if AUTHENTICATION_SERVICES_AVAILABLE
-        if (@available(iOS 13.0, tvOS 13.0, macOS 10.15, *))
+        if (@available(iOS 13.0, tvOS 13.0, macOS 10.15, visionOS 1.0, *))
         {
             _appleIdProvider = [[ASAuthorizationAppleIDProvider alloc] init];
             _passwordProvider = [[ASAuthorizationPasswordProvider alloc] init];
@@ -90,7 +90,7 @@ API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0))
 - (void) quickLogin:(uint)requestId withNonce:(NSString *)nonce andState:(NSString *)state
 {
 #if AUTHENTICATION_SERVICES_AVAILABLE
-    if (@available(iOS 13.0, tvOS 13.0, macOS 10.15, *))
+    if (@available(iOS 13.0, tvOS 13.0, macOS 10.15, visionOS 1.0, *))
     {
         ASAuthorizationAppleIDRequest *appleIDRequest = [[self appleIdProvider] createRequest];
         [appleIDRequest setNonce:nonce];
@@ -117,7 +117,7 @@ API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0))
 - (void) loginWithAppleId:(uint)requestId withOptions:(AppleAuthManagerLoginOptions)options nonce:(NSString *)nonce andState:(NSString *)state
 {
 #if AUTHENTICATION_SERVICES_AVAILABLE
-    if (@available(iOS 13.0, tvOS 13.0, macOS 10.15, *))
+    if (@available(iOS 13.0, tvOS 13.0, macOS 10.15, visionOS 1.0, *))
     {
         ASAuthorizationAppleIDRequest *request = [[self appleIdProvider] createRequest];
         NSMutableArray *scopes = [NSMutableArray array];
@@ -152,7 +152,7 @@ API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0))
 - (void) getCredentialStateForUser:(NSString *)userId withRequestId:(uint)requestId
 {
 #if AUTHENTICATION_SERVICES_AVAILABLE
-    if (@available(iOS 13.0, tvOS 13.0, macOS 10.15, *))
+    if (@available(iOS 13.0, tvOS 13.0, macOS 10.15, visionOS 1.0, *))
     {
         [[self appleIdProvider] getCredentialStateForUserID:userId completion:^(ASAuthorizationAppleIDProviderCredentialState credentialState, NSError * _Nullable error) {
             NSNumber *credentialStateNumber = nil;
@@ -185,7 +185,7 @@ API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0))
 - (void) registerCredentialsRevokedCallbackForRequestId:(uint)requestId
 {
 #if AUTHENTICATION_SERVICES_AVAILABLE
-    if (@available(iOS 13.0, tvOS 13.0, macOS 10.15, *))
+    if (@available(iOS 13.0, tvOS 13.0, macOS 10.15, visionOS 1.0, *))
     {
         if ([self credentialsRevokedObserver])
         {
@@ -265,7 +265,7 @@ API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0))
 #if AUTHENTICATION_SERVICES_AVAILABLE
 
 - (void) performAuthorizationRequestsForController:(ASAuthorizationController *)authorizationController withRequestId:(uint)requestId
-API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0))
+API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0), visionos(1.0))
 {
     NSValue *authControllerAsKey = [NSValue valueWithNonretainedObject:authorizationController];
     [[self authorizationsInProgress] setObject:@(requestId) forKey:authControllerAsKey];
@@ -278,7 +278,7 @@ API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0))
 #pragma mark ASAuthorizationControllerDelegate protocol implementation
 
 - (void) authorizationController:(ASAuthorizationController *)controller didCompleteWithAuthorization:(ASAuthorization *)authorization
-API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0))
+API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0), visionos(1.0))
 {
     NSValue *authControllerAsKey = [NSValue valueWithNonretainedObject:controller];
     NSNumber *requestIdNumber = [[self authorizationsInProgress] objectForKey:authControllerAsKey];
@@ -306,7 +306,7 @@ API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0))
 }
 
 - (void) authorizationController:(ASAuthorizationController *)controller didCompleteWithError:(NSError *)error
-API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0))
+API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0), visionos(1.0))
 {
     NSValue *authControllerAsKey = [NSValue valueWithNonretainedObject:controller];
     NSNumber *requestIdNumber = [[self authorizationsInProgress] objectForKey:authControllerAsKey];
@@ -326,9 +326,10 @@ API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0))
 #pragma mark ASAuthorizationControllerPresentationContextProviding protocol implementation
 
 - (ASPresentationAnchor) presentationAnchorForAuthorizationController:(ASAuthorizationController *)controller
-API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0))
+API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0), visionos(1.0))
 {
-    #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 || __TV_OS_VERSION_MAX_ALLOWED >= 130000
+    
+    #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 || __TV_OS_VERSION_MAX_ALLOWED >= 130000 || __VISION_OS_VERSION_MAX_ALLOWED >= 10000
         return [[[UIApplication sharedApplication] delegate] window];
     #elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
         return [[NSApplication sharedApplication] mainWindow];
@@ -343,9 +344,9 @@ API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0))
 
 #pragma mark - Native C Calls
 
-bool AppleAuth_IsCurrentPlatformSupported()
+bool AppleAuth_IsCurrentPlatformSupported(void)
 {
-    if (@available(iOS 13.0, tvOS 13.0, macOS 10.15, *))
+    if (@available(iOS 13.0, tvOS 13.0, macOS 10.15, visionOS 1.0, *))
     {
         return true;
     }

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native/iOS/AppleAuthManager.m.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4ea7c90f3e44b49608eed2c1ae802944
+guid: df29709c0b9d54068969948458498dcf
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

+ 9 - 9
Assets/AppleSignInUnity/AppleAuth/Native/iOS/AppleAuthSerializer.h

@@ -24,8 +24,8 @@
 
 #import <Foundation/Foundation.h>
 
-// IOS/TVOS 13.0 | MACOS 10.15
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 || __TV_OS_VERSION_MAX_ALLOWED >= 130000 || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
+// IOS/TVOS 13.0 | MACOS 10.15 | VISIONOS 1.0
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 || __TV_OS_VERSION_MAX_ALLOWED >= 130000 || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500 || __VISION_OS_VERSION_MAX_ALLOWED >= 10000
 #import <AuthenticationServices/AuthenticationServices.h>
 #endif
 
@@ -40,22 +40,22 @@
                                                       passwordCredentialDictionary:(NSDictionary * _Nullable)passwordCredentialDictionary
                                                                    errorDictionary:(NSDictionary * _Nullable)errorDictionary;
 
-// IOS/TVOS 9.0 | MACOS 10.11
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90000 || __TV_OS_VERSION_MAX_ALLOWED >= 90000 || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
+// IOS/TVOS 9.0 | MACOS 10.11 | VISIONOS 1.0
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90000 || __TV_OS_VERSION_MAX_ALLOWED >= 90000 || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100 || __VISION_OS_VERSION_MAX_ALLOWED >= 10000
 
 + (NSDictionary * _Nullable) dictionaryForNSPersonNameComponents:(NSPersonNameComponents * _Nullable)nameComponents
-API_AVAILABLE(ios(9.0), macos(10.11), tvos(9.0), watchos(2.0));
+API_AVAILABLE(ios(9.0), macos(10.11), tvos(9.0), watchos(2.0), visionos(1.0));
 
 #endif
 
-// IOS/TVOS 13.0 | MACOS 10.15
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 || __TV_OS_VERSION_MAX_ALLOWED >= 130000 || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
+// IOS/TVOS 13.0 | MACOS 10.15 | VISIONOS 1.0
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 || __TV_OS_VERSION_MAX_ALLOWED >= 130000 || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500 || __VISION_OS_VERSION_MAX_ALLOWED >= 10000
 
 + (NSDictionary * _Nullable) dictionaryForASAuthorizationAppleIDCredential:(ASAuthorizationAppleIDCredential * _Nullable)appleIDCredential
-API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0));
+API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0), visionos(1.0));
 
 + (NSDictionary * _Nullable) dictionaryForASPasswordCredential:(ASPasswordCredential * _Nullable)passwordCredential
-API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0));
+API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0), watchos(6.0), visionos(1.0));
 
 #endif
 

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native/iOS/AppleAuthSerializer.h.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 77979d61af9924ca4820cfc62d0a493a
+guid: 576c4e551e2224c8fa8832cb12a61bd2
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

+ 4 - 4
Assets/AppleSignInUnity/AppleAuth/Native/iOS/AppleAuthSerializer.m

@@ -74,8 +74,8 @@
     return [result copy];
 }
 
-// IOS/TVOS 9.0 | MACOS 10.11
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90000 || __TV_OS_VERSION_MAX_ALLOWED >= 90000 || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
+// IOS/TVOS 9.0 | MACOS 10.11 | VISIONOS 1.0
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90000 || __TV_OS_VERSION_MAX_ALLOWED >= 90000 || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100 || __VISION_OS_VERSION_MAX_ALLOWED >= 10000
 
 + (NSDictionary *) dictionaryForNSPersonNameComponents:(NSPersonNameComponents *)nameComponents
 {
@@ -111,8 +111,8 @@
 
 #endif
 
-// IOS/TVOS 13.0 | MACOS 10.15
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 || __TV_OS_VERSION_MAX_ALLOWED >= 130000 || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
+// IOS/TVOS 13.0 | MACOS 10.15 | VISIONOS 1.0
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 || __TV_OS_VERSION_MAX_ALLOWED >= 130000 || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500 || __VISION_OS_VERSION_MAX_ALLOWED >= 10000
 
 + (NSDictionary *) dictionaryForASAuthorizationAppleIDCredential:(ASAuthorizationAppleIDCredential *)appleIDCredential
 {

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native/iOS/AppleAuthSerializer.m.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1e6b72809d9044a83885801f89f8e67f
+guid: d76f903949803420aba83f8ff8da7d44
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native/iOS/PersonNameComponentsFormatting.m

@@ -46,7 +46,7 @@ const char* AppleAuth_GetPersonNameUsingFormatter(const char *payload, int style
     if (error)
         return NULL;
     
-    if (@available(iOS 9.0, tvOS 9.0, macOS 10.11, *)) {
+    if (@available(iOS 9.0, tvOS 9.0, macOS 10.11, visionOS 1.0, *)) {
         NSPersonNameComponents *nameData = [[NSPersonNameComponents alloc] init];
         [nameData setNamePrefix:[nameComponentsDictionary objectForKey:@"_namePrefix"]];
         [nameData setGivenName:[nameComponentsDictionary objectForKey:@"_givenName"]];

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/Native/iOS/PersonNameComponentsFormatting.m.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b89ca8ecbea5c4f0dad838a9fde67910
+guid: 1742c1e92a67c48b4a36996ec0bbef55
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

+ 2 - 2
Assets/AppleSignInUnity/AppleAuth/package.json

@@ -1,8 +1,8 @@
 {
     "name": "com.lupidan.apple-signin-unity-src",
     "displayName": "Sign in with Apple [Local Source]",
-    "version": "1.4.2",
-    "unity": "2018.3",
+    "version": "1.4.4",
+    "unity": "2020.3",
     "description": "[Local Source]\nProvides a Unity bridge to use the native Sign In With Apple method on iOS/iPadOS/tvOS/macOS devices",
     "author": {
         "name": "Daniel Lupiañez Casares",

+ 1 - 1
Assets/AppleSignInUnity/AppleAuth/package.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b78cf518d23ce49d1996efcd91b8b00a
+guid: 58dfe75f088e0478999dc7f2af3601eb
 TextScriptImporter:
   externalObjects: {}
   userData: 

+ 1 - 35
Assets/AppleSignInUnity/AppleAuthSample/GameMenuHandler.cs

@@ -1,12 +1,9 @@
 using AppleAuth.Enums;
 using AppleAuth.Extensions;
 using AppleAuth.Interfaces;
-using Newtonsoft.Json;
 using System;
-using System.Collections;
 using System.Text;
 using UnityEngine;
-using UnityEngine.Networking;
 using UnityEngine.UI;
 
 [Serializable]
@@ -67,7 +64,6 @@ public class GameMenuHandler
                 stringBuilder.AppendLine("<b>Email:</b> " + appleIdCredential.Email);
             }
 
-
             if (appleIdCredential.FullName != null)
             {
                 var fullName = appleIdCredential.FullName;
@@ -90,7 +86,7 @@ public class GameMenuHandler
                     stringBuilder.AppendLine("<b>Phonetic name (Abbreviated):</b> " + phoneticName.ToLocalizedString(PersonNameFormatterStyle.Abbreviated));
                 }
             }
-          
+
             this.AppleUserCredentialLabel.text = stringBuilder.ToString();
         }
         else if (passwordCredential != null)
@@ -106,34 +102,4 @@ public class GameMenuHandler
             this.AppleUserCredentialLabel.text = "Unknown credentials for user " + receivedCredential.User;
         }
     }
-
-
-    public IEnumerator LoginByApple(string identityToken,string email,string fullName, Action<RequestResult> callback)
-    {
-        string url = "http://192.168.0.112:11433/SmartBowBusinessServer/gameLogin/loginByApple";
-        WWWForm form = new WWWForm();
-        form.AddField("identityToken", identityToken);
-        form.AddField("email", email);
-        form.AddField("fullName", fullName);
-        form.AddField("serverIndex", 0);
-        using (UnityWebRequest request = UnityWebRequest.Post(url, form))
-        {
-            request.timeout = 10;
-            yield return request.SendWebRequest();
-            RequestResult requestResult = new RequestResult();
-            if (request.result == UnityWebRequest.Result.Success)
-            {
-                requestResult = JsonConvert.DeserializeObject<RequestResult>(request.downloadHandler.text);
-            }
-            if (callback != null) callback(requestResult);
-        }
-    }
-
-
-    public class RequestResult
-    {
-        public int code = -9999;
-        public object data;
-        public string msg;
-    }
 }

+ 117 - 67
Assets/AppleSignInUnity/AppleAuthSample/LandscapeSampleScene.unity

@@ -38,12 +38,11 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 11
+  serializedVersion: 12
   m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
@@ -54,7 +53,7 @@ LightmapSettings:
     m_EnableBakedLightmaps: 0
     m_EnableRealtimeLightmaps: 0
   m_LightmapEditorSettings:
-    serializedVersion: 10
+    serializedVersion: 12
     m_Resolution: 2
     m_BakeResolution: 40
     m_AtlasSize: 1024
@@ -62,6 +61,7 @@ LightmapSettings:
     m_AOMaxDistance: 1
     m_CompAOExponent: 1
     m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
     m_Padding: 2
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
@@ -76,10 +76,16 @@ LightmapSettings:
     m_PVRDirectSampleCount: 32
     m_PVRSampleCount: 500
     m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 500
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 2
+    m_PVRDenoiserTypeDirect: 0
+    m_PVRDenoiserTypeIndirect: 0
+    m_PVRDenoiserTypeAO: 0
     m_PVRFilterTypeDirect: 0
     m_PVRFilterTypeIndirect: 0
     m_PVRFilterTypeAO: 0
-    m_PVRFilteringMode: 1
+    m_PVREnvironmentMIS: 0
     m_PVRCulling: 1
     m_PVRFilteringGaussRadiusDirect: 1
     m_PVRFilteringGaussRadiusIndirect: 5
@@ -87,9 +93,11 @@ LightmapSettings:
     m_PVRFilteringAtrousPositionSigmaDirect: 0.5
     m_PVRFilteringAtrousPositionSigmaIndirect: 2
     m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ShowResolutionOverlay: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 1
+  m_LightingSettings: {fileID: 4890085278179872738, guid: 59665939117ba5f4b81339b23a21fc4d, type: 2}
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -109,6 +117,8 @@ NavMeshSettings:
     manualTileSize: 0
     tileSize: 256
     accuratePlacement: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
@@ -140,6 +150,7 @@ 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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1437970511}
   m_RootOrder: 0
@@ -158,17 +169,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 164572784}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 3c30d3e2527b24159aff33e7c3df93ec, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -178,6 +189,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!222 &164572787
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -214,6 +226,7 @@ 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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1437970511}
   m_RootOrder: 1
@@ -232,19 +245,19 @@ MonoBehaviour:
   m_GameObject: {fileID: 380728728}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 35
     m_FontStyle: 1
     m_BestFit: 0
@@ -293,6 +306,7 @@ 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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 446034568}
   m_RootOrder: 0
@@ -311,17 +325,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 427037881}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
@@ -331,6 +345,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!222 &427037884
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -365,6 +380,7 @@ 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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 427037882}
   m_Father: {fileID: 1604312733}
@@ -413,9 +429,10 @@ Camera:
   m_ClearFlags: 2
   m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
   m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
   m_SensorSize: {x: 36, y: 24}
   m_LensShift: {x: 0, y: 0}
-  m_GateFitMode: 2
   m_FocalLength: 50
   m_NormalizedViewPortRect:
     serializedVersion: 2
@@ -453,6 +470,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -484,9 +502,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 737597197}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
   m_HorizontalAxis: Horizontal
   m_VerticalAxis: Vertical
   m_SubmitButton: Submit
@@ -503,7 +522,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 737597197}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_FirstSelected: {fileID: 0}
@@ -519,6 +538,7 @@ Transform:
   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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 2
@@ -551,6 +571,7 @@ 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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1057093047}
   m_RootOrder: 1
@@ -569,19 +590,19 @@ MonoBehaviour:
   m_GameObject: {fileID: 773626337}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 60
     m_FontStyle: 1
     m_BestFit: 0
@@ -630,6 +651,7 @@ 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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 985611611}
   m_RootOrder: 0
@@ -648,17 +670,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 846297118}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 03e44ceef86484514b21af9518dbde83, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -668,6 +690,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!222 &846297121
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -704,6 +727,7 @@ 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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1528511535}
   m_RootOrder: 1
@@ -722,19 +746,19 @@ MonoBehaviour:
   m_GameObject: {fileID: 865973404}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 35
     m_FontStyle: 1
     m_BestFit: 0
@@ -783,6 +807,7 @@ 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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1088787688}
   - {fileID: 1604312733}
@@ -811,7 +836,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 972665743}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 1402212518}
@@ -832,8 +857,6 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!1 &985611610
 GameObject:
   m_ObjectHideFlags: 0
@@ -860,6 +883,7 @@ 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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 846297119}
   - {fileID: 1942013981}
@@ -897,6 +921,7 @@ 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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1274371106}
   - {fileID: 773626338}
@@ -939,6 +964,7 @@ 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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1402212518}
   m_Father: {fileID: 972665744}
@@ -958,17 +984,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 1088787687}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
@@ -978,6 +1004,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!222 &1088787690
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -995,7 +1022,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1088787687}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
@@ -1027,6 +1054,7 @@ 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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1402212518}
   m_RootOrder: 0
@@ -1045,19 +1073,19 @@ MonoBehaviour:
   m_GameObject: {fileID: 1092483038}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
@@ -1106,6 +1134,7 @@ 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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1057093047}
   m_RootOrder: 0
@@ -1124,17 +1153,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 1274371105}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 3c30d3e2527b24159aff33e7c3df93ec, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -1144,6 +1173,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!222 &1274371108
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1180,6 +1210,7 @@ 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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1092483039}
   m_Father: {fileID: 1088787688}
@@ -1199,7 +1230,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1402212517}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
@@ -1213,7 +1244,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1402212517}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
@@ -1227,6 +1258,9 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 1
   m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &1437970510
 GameObject:
   m_ObjectHideFlags: 0
@@ -1253,6 +1287,7 @@ 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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 164572785}
   - {fileID: 380728729}
@@ -1293,6 +1328,7 @@ 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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1528511535}
   m_RootOrder: 0
@@ -1311,17 +1347,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 1500921252}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 29e88308418d442029a2a842d3067c90, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -1331,6 +1367,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!222 &1500921255
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1368,6 +1405,7 @@ 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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1500921253}
   - {fileID: 865973405}
@@ -1388,11 +1426,12 @@ MonoBehaviour:
   m_GameObject: {fileID: 1528511534}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -1402,17 +1441,20 @@ MonoBehaviour:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
   m_SpriteState:
     m_HighlightedSprite: {fileID: 0}
     m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 1528511537}
@@ -1420,6 +1462,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 1904563931}
+        m_TargetAssemblyTypeName: 
         m_MethodName: SignInWithAppleButtonPressed
         m_Mode: 1
         m_Arguments:
@@ -1430,8 +1473,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!114 &1528511537
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1441,17 +1482,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 1528511534}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 9c9455db146a146bda9a369252c82209, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
@@ -1461,6 +1502,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!222 &1528511538
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1498,6 +1540,7 @@ 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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 446034568}
   m_Father: {fileID: 972665744}
@@ -1517,11 +1560,12 @@ MonoBehaviour:
   m_GameObject: {fileID: 1604312732}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -2061169968, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -1531,17 +1575,20 @@ MonoBehaviour:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
   m_SpriteState:
     m_HighlightedSprite: {fileID: 0}
     m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 427037883}
@@ -1553,8 +1600,6 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!114 &1604312735
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1564,17 +1609,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 1604312732}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
@@ -1584,6 +1629,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!222 &1604312736
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1621,7 +1667,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1904563926}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_IgnoreReversedGraphics: 1
@@ -1638,7 +1684,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1904563926}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_UiScaleMode: 1
@@ -1651,6 +1697,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
 --- !u!223 &1904563929
 Canvas:
   m_ObjectHideFlags: 0
@@ -1668,6 +1715,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
@@ -1682,6 +1730,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1057093047}
   - {fileID: 1437970511}
@@ -1744,6 +1793,7 @@ 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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 985611611}
   m_RootOrder: 1
@@ -1762,19 +1812,19 @@ MonoBehaviour:
   m_GameObject: {fileID: 1942013980}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 35
     m_FontStyle: 2
     m_BestFit: 0

+ 64 - 0
Assets/AppleSignInUnity/AppleAuthSample/LandscapeSampleSceneSettings.lighting

@@ -0,0 +1,64 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!850595691 &4890085278179872738
+LightingSettings:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: LandscapeSampleSceneSettings
+  serializedVersion: 4
+  m_GIWorkflowMode: 1
+  m_EnableBakedLightmaps: 0
+  m_EnableRealtimeLightmaps: 0
+  m_RealtimeEnvironmentLighting: 1
+  m_BounceScale: 1
+  m_AlbedoBoost: 1
+  m_IndirectOutputScale: 1
+  m_UsingShadowmask: 1
+  m_BakeBackend: 0
+  m_LightmapMaxSize: 1024
+  m_BakeResolution: 40
+  m_Padding: 2
+  m_LightmapCompression: 3
+  m_AO: 0
+  m_AOMaxDistance: 1
+  m_CompAOExponent: 1
+  m_CompAOExponentDirect: 0
+  m_ExtractAO: 0
+  m_MixedBakeMode: 2
+  m_LightmapsBakeMode: 1
+  m_FilterMode: 1
+  m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
+  m_ExportTrainingData: 0
+  m_TrainingDataDestination: TrainingData
+  m_RealtimeResolution: 2
+  m_ForceWhiteAlbedo: 0
+  m_ForceUpdates: 0
+  m_FinalGather: 0
+  m_FinalGatherRayCount: 256
+  m_FinalGatherFiltering: 1
+  m_PVRCulling: 1
+  m_PVRSampling: 1
+  m_PVRDirectSampleCount: 32
+  m_PVRSampleCount: 500
+  m_PVREnvironmentSampleCount: 500
+  m_PVREnvironmentReferencePointCount: 2048
+  m_LightProbeSampleCountMultiplier: 4
+  m_PVRBounces: 2
+  m_PVRMinBounces: 2
+  m_PVREnvironmentMIS: 0
+  m_PVRFilteringMode: 2
+  m_PVRDenoiserTypeDirect: 0
+  m_PVRDenoiserTypeIndirect: 0
+  m_PVRDenoiserTypeAO: 0
+  m_PVRFilterTypeDirect: 0
+  m_PVRFilterTypeIndirect: 0
+  m_PVRFilterTypeAO: 0
+  m_PVRFilteringGaussRadiusDirect: 1
+  m_PVRFilteringGaussRadiusIndirect: 5
+  m_PVRFilteringGaussRadiusAO: 2
+  m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+  m_PVRFilteringAtrousPositionSigmaIndirect: 2
+  m_PVRFilteringAtrousPositionSigmaAO: 1
+  m_PVRTiledBaking: 0

+ 1 - 1
Assets/BowArrow/Scenes/GameChallengeScene/场景备份/GameChallengeLightingSettings 1.lighting.meta → Assets/AppleSignInUnity/AppleAuthSample/LandscapeSampleSceneSettings.lighting.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2e7b5202a8fe8c644bf7265fe291ecf1
+guid: 59665939117ba5f4b81339b23a21fc4d
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 4890085278179872738

+ 18 - 174
Assets/AppleSignInUnity/AppleAuthSample/MainMenu.cs

@@ -1,19 +1,14 @@
-using System;
-using System.Collections;
-using System.Text;
-using AppleAuth;
+using AppleAuth;
 using AppleAuth.Enums;
 using AppleAuth.Extensions;
 using AppleAuth.Interfaces;
 using AppleAuth.Native;
-using Newtonsoft.Json;
 using UnityEngine;
-using UnityEngine.Networking;
 
 public class MainMenu : MonoBehaviour
 {
     private const string AppleUserIdKey = "AppleUserId";
-
+    
     private IAppleAuthManager _appleAuthManager;
 
     public LoginMenuHandler LoginMenu;
@@ -27,11 +22,10 @@ public class MainMenu : MonoBehaviour
             // Creates a default JSON deserializer, to transform JSON Native responses to C# instances
             var deserializer = new PayloadDeserializer();
             // Creates an Apple Authentication manager with the deserializer
-            this._appleAuthManager = new AppleAuthManager(deserializer);
+            this._appleAuthManager = new AppleAuthManager(deserializer);    
         }
 
         this.InitializeLoginMenu();
-
     }
 
     private void Update()
@@ -42,7 +36,7 @@ public class MainMenu : MonoBehaviour
         {
             this._appleAuthManager.Update();
         }
-
+        
         this.LoginMenu.UpdateLoadingMessage(Time.deltaTime);
     }
 
@@ -51,27 +45,19 @@ public class MainMenu : MonoBehaviour
         this.SetupLoginMenuForAppleSignIn();
         this.SignInWithApple();
     }
-    public void SignInWithAppleButtonPressed2()
-    {
-        this.SignInWithApple();
-    }
-    public void SignInWithAppleButtonPressedDelete()
-    {
-        this.DeleteSignInWithApple();
-       
-    }
+
     private void InitializeLoginMenu()
     {
         this.LoginMenu.SetVisible(visible: true);
         this.GameMenu.SetVisible(visible: false);
-
+        
         // Check if the current platform supports Sign In With Apple
         if (this._appleAuthManager == null)
         {
             this.SetupLoginMenuForUnsupportedPlatform();
             return;
         }
-
+        
         // If at any point we receive a credentials revoked notification, we delete the stored User ID, and go back to login
         this._appleAuthManager.SetCredentialsRevokedCallback(result =>
         {
@@ -102,7 +88,7 @@ public class MainMenu : MonoBehaviour
         this.LoginMenu.SetSignInWithAppleButton(visible: false, enabled: false);
         this.LoginMenu.SetLoadingMessage(visible: true, message: "Unsupported platform");
     }
-
+    
     private void SetupLoginMenuForSignInWithApple()
     {
         this.LoginMenu.SetVisible(visible: true);
@@ -110,7 +96,7 @@ public class MainMenu : MonoBehaviour
         this.LoginMenu.SetSignInWithAppleButton(visible: true, enabled: true);
         this.LoginMenu.SetLoadingMessage(visible: false, message: string.Empty);
     }
-
+    
     private void SetupLoginMenuForCheckingCredentials()
     {
         this.LoginMenu.SetVisible(visible: true);
@@ -118,7 +104,7 @@ public class MainMenu : MonoBehaviour
         this.LoginMenu.SetSignInWithAppleButton(visible: true, enabled: false);
         this.LoginMenu.SetLoadingMessage(visible: true, message: "Checking Apple Credentials");
     }
-
+    
     private void SetupLoginMenuForQuickLoginAttempt()
     {
         this.LoginMenu.SetVisible(visible: true);
@@ -126,7 +112,7 @@ public class MainMenu : MonoBehaviour
         this.LoginMenu.SetSignInWithAppleButton(visible: true, enabled: false);
         this.LoginMenu.SetLoadingMessage(visible: true, message: "Attempting Quick Login");
     }
-
+    
     private void SetupLoginMenuForAppleSignIn()
     {
         this.LoginMenu.SetVisible(visible: true);
@@ -134,7 +120,7 @@ public class MainMenu : MonoBehaviour
         this.LoginMenu.SetSignInWithAppleButton(visible: true, enabled: false);
         this.LoginMenu.SetLoadingMessage(visible: true, message: "Signing In with Apple");
     }
-
+    
     private void SetupGameMenu(string appleUserId, ICredential credential)
     {
         this.LoginMenu.SetVisible(visible: false);
@@ -155,7 +141,7 @@ public class MainMenu : MonoBehaviour
                     case CredentialState.Authorized:
                         this.SetupGameMenu(appleUserId, null);
                         return;
-
+                    
                     // If it was revoked, or not found, we need a new sign in with apple attempt
                     // Discard previous apple user id
                     case CredentialState.Revoked:
@@ -172,11 +158,11 @@ public class MainMenu : MonoBehaviour
                 this.SetupLoginMenuForSignInWithApple();
             });
     }
-
+    
     private void AttemptQuickLogin()
     {
         var quickLoginArgs = new AppleAuthQuickLoginArgs();
-
+        
         // Quick login should succeed if the credential was authorized before and not revoked
         this._appleAuthManager.QuickLogin(
             quickLoginArgs,
@@ -186,11 +172,10 @@ public class MainMenu : MonoBehaviour
                 var appleIdCredential = credential as IAppleIDCredential;
                 if (appleIdCredential != null)
                 {
-                    PlayerPrefs.SetString(AppleUserIdKey, credential.User);
+                    PlayerPrefs.SetString(AppleUserIdKey, credential.User);    
                 }
 
                 this.SetupGameMenu(credential.User, credential);
-                this.onAppleData(credential.User, credential);
             },
             error =>
             {
@@ -200,11 +185,11 @@ public class MainMenu : MonoBehaviour
                 this.SetupLoginMenuForSignInWithApple();
             });
     }
-
+    
     private void SignInWithApple()
     {
         var loginArgs = new AppleAuthLoginArgs(LoginOptions.IncludeEmail | LoginOptions.IncludeFullName);
-
+        
         this._appleAuthManager.LoginWithAppleId(
             loginArgs,
             credential =>
@@ -212,39 +197,6 @@ public class MainMenu : MonoBehaviour
                 // If a sign in with apple succeeds, we should have obtained the credential with the user id, name, and email, save it
                 PlayerPrefs.SetString(AppleUserIdKey, credential.User);
                 this.SetupGameMenu(credential.User, credential);
-                this.onAppleData(credential.User, credential);
-            },
-            error =>
-            {
-                var authorizationErrorCode = error.GetAuthorizationErrorCode();
-                Debug.LogWarning("Sign in with Apple failed " + authorizationErrorCode.ToString() + " " + error.ToString());
-                this.SetupLoginMenuForSignInWithApple();
-            });
-    }
-
-    private void DeleteSignInWithApple() {
-        var loginArgs = new AppleAuthLoginArgs(LoginOptions.IncludeEmail | LoginOptions.IncludeFullName);
-
-        this._appleAuthManager.LoginWithAppleId(
-            loginArgs,
-            credential =>
-            {
-                var appleIdCredential = credential as IAppleIDCredential;
-                if (appleIdCredential.AuthorizationCode != null)
-                {
-                    var authorizationCode = Encoding.UTF8.GetString(appleIdCredential.AuthorizationCode, 0, appleIdCredential.AuthorizationCode.Length);
-                    Debug.Log("delete===authorizationCode======= " + authorizationCode.Substring(0, 45));
-                    StartCoroutine(DdeleteUserByApple(authorizationCode, (res) =>
-                    {
-                        Debug.Log($"DdeleteUserByApple service rescode {res.code}, msg {res.msg}");
-                        if (res.code == 0)
-                        {
-                            Debug.Log("删除成功");
-                            this.SetupLoginMenuForSignInWithApple();
-                            PlayerPrefs.DeleteKey(AppleUserIdKey);
-                        }
-                    }));
-                }
             },
             error =>
             {
@@ -252,113 +204,5 @@ public class MainMenu : MonoBehaviour
                 Debug.LogWarning("Sign in with Apple failed " + authorizationErrorCode.ToString() + " " + error.ToString());
                 this.SetupLoginMenuForSignInWithApple();
             });
-
-    }
-
-    public void onAppleData(string appleUserId, ICredential receivedCredential)
-    {
-        var appleIdCredential = receivedCredential as IAppleIDCredential;
-        if (appleIdCredential != null)
-        {
-
-            if (appleIdCredential.IdentityToken != null)
-            {
-                var identityToken = Encoding.UTF8.GetString(appleIdCredential.IdentityToken, 0, appleIdCredential.IdentityToken.Length);
-                Debug.Log("11===identityToken======= " + identityToken);
-            }
-            if (appleIdCredential.AuthorizationCode != null)
-            {
-                var authorizationCode = Encoding.UTF8.GetString(appleIdCredential.AuthorizationCode, 0, appleIdCredential.AuthorizationCode.Length);
-                Debug.Log("22===authorizationCode======= " + authorizationCode.Substring(0, 45));
-            }
-
-
-            string _email = "";
-            if (appleIdCredential.Email != null)
-            {
-                _email = appleIdCredential.Email;
-            }
-            Debug.Log("33===Email======= " + _email);
-            string _fullName = "";
-            if (appleIdCredential.FullName != null)
-            {
-                var fullName = appleIdCredential.FullName;
-                if (appleIdCredential.FullName.PhoneticRepresentation != null)
-                {
-                    var phoneticName = appleIdCredential.FullName.PhoneticRepresentation;
-                    //phoneticName.ToLocalizedString()
-                }
-                _fullName = fullName.ToLocalizedString();
-            }
-            Debug.Log("44===FullName======= " + appleIdCredential.FullName);
-            var _identityToken = Encoding.UTF8.GetString(appleIdCredential.IdentityToken, 0, appleIdCredential.IdentityToken.Length);
-            StartCoroutine(LoginByApple(_identityToken, _email, _fullName, (res) =>
-            {
-                Debug.Log($"LoginByApple service rescode {res.code}, msg {res.msg}");
-                if (res.code == 0)
-                {
-                    Debug.Log("LoginByApple 登录");
-                }
-                else
-                {
-                    this.SetupLoginMenuForSignInWithApple();
-                    PlayerPrefs.DeleteKey(AppleUserIdKey);
-                }
-            }));
-        }
-        else
-        {
-
-                    this.SetupLoginMenuForSignInWithApple();
-                    PlayerPrefs.DeleteKey(AppleUserIdKey);
-        }
-    }
-
-
-    public IEnumerator LoginByApple(string identityToken, string email, string fullName, Action<RequestResult> callback)
-    {
-        string url = "http://192.168.0.112:11432/SmartBowBusinessServer/gameLogin/loginByApple";
-        WWWForm form = new WWWForm();
-        form.AddField("identityToken", identityToken);
-        form.AddField("email", email);
-        form.AddField("fullName", fullName);
-        form.AddField("serverIndex", 0);
-        using (UnityWebRequest request = UnityWebRequest.Post(url, form))
-        {
-            request.timeout = 10;
-            yield return request.SendWebRequest();
-            RequestResult requestResult = new RequestResult();
-            if (request.result == UnityWebRequest.Result.Success)
-            {
-                requestResult = JsonConvert.DeserializeObject<RequestResult>(request.downloadHandler.text);
-            }
-            if (callback != null) callback(requestResult);
-        }
-    }
-
-
-    public IEnumerator DdeleteUserByApple(string identityToken, Action<RequestResult> callback)
-    {
-        string url = "http://192.168.0.112:11432/SmartBowBusinessServer/gameLogin/deleteUserByApple";
-        WWWForm form = new WWWForm();
-        form.AddField("identityToken", identityToken);
-        using (UnityWebRequest request = UnityWebRequest.Post(url, form))
-        {
-            request.timeout = 10;
-            yield return request.SendWebRequest();
-            RequestResult requestResult = new RequestResult();
-            if (request.result == UnityWebRequest.Result.Success)
-            {
-                requestResult = JsonConvert.DeserializeObject<RequestResult>(request.downloadHandler.text);
-            }
-            if (callback != null) callback(requestResult);
-        }
-    }
-
-    public class RequestResult
-    {
-        public int code = -9999;
-        public object data;
-        public string msg;
     }
 }

+ 16 - 446
Assets/AppleSignInUnity/AppleAuthSample/SampleScene.unity

@@ -38,7 +38,6 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -152,9 +151,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 687427643}
-  - {fileID: 616666197}
+  m_Children: []
   m_Father: {fileID: 1437970511}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -260,7 +257,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 35
     m_FontStyle: 1
     m_BestFit: 0
@@ -315,7 +312,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -478,274 +475,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &616666196
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 616666197}
-  - component: {fileID: 616666200}
-  - component: {fileID: 616666199}
-  - component: {fileID: 616666198}
-  m_Layer: 5
-  m_Name: Button (Legacy) (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &616666197
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 616666196}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 2.1491, y: 2.1491, z: 2.1491}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1359480519}
-  m_Father: {fileID: 164572785}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 521, y: -47.499874}
-  m_SizeDelta: {x: 74.6474, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &616666198
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 616666196}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 616666199}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 1904563931}
-        m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp
-        m_MethodName: SignInWithAppleButtonPressedDelete
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
---- !u!114 &616666199
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 616666196}
-  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  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!222 &616666200
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 616666196}
-  m_CullTransparentMesh: 1
---- !u!1 &687427642
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 687427643}
-  - component: {fileID: 687427646}
-  - component: {fileID: 687427645}
-  - component: {fileID: 687427644}
-  m_Layer: 5
-  m_Name: Button (Legacy)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &687427643
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 687427642}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 2.1491, y: 2.1491, z: 2.1491}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1716739429}
-  m_Father: {fileID: 164572785}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 258.2843, y: -47.499874}
-  m_SizeDelta: {x: 74.6474, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &687427644
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 687427642}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 687427645}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 1904563931}
-        m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp
-        m_MethodName: SignInWithAppleButtonPressed2
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
---- !u!114 &687427645
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 687427642}
-  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  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!222 &687427646
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 687427642}
-  m_CullTransparentMesh: 1
 --- !u!1 &737597197
 GameObject:
   m_ObjectHideFlags: 0
@@ -873,7 +602,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 60
     m_FontStyle: 1
     m_BestFit: 0
@@ -1029,7 +758,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 35
     m_FontStyle: 1
     m_BestFit: 0
@@ -1242,9 +971,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -17, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1088787689
 MonoBehaviour:
@@ -1330,10 +1059,10 @@ RectTransform:
   m_Father: {fileID: 1402212518}
   m_RootOrder: 0
   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_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 341.5, y: -19.30185}
+  m_SizeDelta: {x: 683, y: 38.6037}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1092483040
 MonoBehaviour:
@@ -1356,7 +1085,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
@@ -1453,86 +1182,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1274371105}
   m_CullTransparentMesh: 0
---- !u!1 &1359480518
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1359480519}
-  - component: {fileID: 1359480521}
-  - component: {fileID: 1359480520}
-  m_Layer: 5
-  m_Name: Text (Legacy)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1359480519
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1359480518}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 616666197}
-  m_RootOrder: 0
-  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: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1359480520
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1359480518}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: delete
---- !u!222 &1359480521
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1359480518}
-  m_CullTransparentMesh: 1
 --- !u!1 &1402212517
 GameObject:
   m_ObjectHideFlags: 0
@@ -1570,7 +1219,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: -0.00000718455}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 38.6037}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1402212519
 MonoBehaviour:
@@ -1627,7 +1276,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1437970511
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1989,86 +1638,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1604312732}
   m_CullTransparentMesh: 0
---- !u!1 &1716739428
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1716739429}
-  - component: {fileID: 1716739431}
-  - component: {fileID: 1716739430}
-  m_Layer: 5
-  m_Name: Text (Legacy)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1716739429
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1716739428}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 687427643}
-  m_RootOrder: 0
-  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: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1716739430
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1716739428}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: login
---- !u!222 &1716739431
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1716739428}
-  m_CullTransparentMesh: 1
 --- !u!1 &1904563926
 GameObject:
   m_ObjectHideFlags: 0
@@ -2146,6 +1715,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
@@ -2254,7 +1824,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 35
     m_FontStyle: 2
     m_BestFit: 0

+ 0 - 63
Assets/BowArrow/DebugShoot/BluetoothClient.cs

@@ -1,63 +0,0 @@
-using System;
-using UnityEngine;
-using UnityEngine.UI;
-using JCEngineCore;
-
-[Serializable]
-class JCData {
-    public string uuid;
-    public int type; 
-    public string func;
-    public string[] args;
-}
-
-public class BluetoothClient : MonoBehaviour
-{
-    [SerializeField] string serverIP = "110.43.54.43";
-    [SerializeField] Text text;
-    BleDebugClient client = new BleDebugClient(); 
-    public static System.Action<byte, byte[]> onDataReceived;
-    public static BluetoothClient ins;
-
-    void Start()
-    {
-        ins = this;
-        JCEngine.bootNew("ws://" + serverIP + ":9888/BLE", client);
-    }
-
-    public static void UploadData(byte sign, byte[] bytes) 
-    {
-        if (ins && ins.client.isValid)
-        {
-            string data = String.Join(",", bytes);
-            ins.client.call("uploadData", sign.ToString(), data);
-            ins.Log("正在上传数据\n" + data);
-        }
-    }
-
-    public static void UploadError(params string[] errors) {
-        if (ins) {
-            ins.client.call("showError", string.Join("\n", errors));
-        }
-    }
-
-    public void Log(string text) {
-        if (this.text != null)
-        {
-            this.text.text = text;
-        }
-    }
-}
-class BleDebugClient : JCEntity {
-
-    public void receiveData(string sign, string byteStrList) {
-        string[] byteStrs = byteStrList.Split(',');
-        byte[] bytes = new byte[byteStrs.Length];
-        for (int i = 0; i < bytes.Length; i++)
-        {
-            bytes[i] = Byte.Parse(byteStrs[i]);
-        }
-        BluetoothClient.ins.Log("接收数据\n" + byteStrList);
-        BluetoothClient.onDataReceived?.Invoke(byte.Parse(sign), bytes);
-    }
-}

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov