浏览代码

Fixing issues + updating versions of packages

/main
Julia Perdigueiro 4 年前
当前提交
97318410
共有 10 个文件被更改,包括 120 次插入58 次删除
  1. 8
      Assets/Scripts/UI/EndScreen.cs
  2. 2
      Assets/Scripts/UI/GameScreen.cs
  3. 13
      Assets/Scripts/UI/HealthBar.cs
  4. 10
      Packages/manifest.json
  5. 19
      Packages/packages-lock.json
  6. 64
      ProjectSettings/ProjectSettings.asset
  7. 4
      ProjectSettings/ProjectVersion.txt
  8. 7
      UserSettings/EditorUserSettings.asset
  9. 8
      Assets/StreamingAssets.meta
  10. 43
      ProjectSettings/PackageManagerSettings.asset

8
Assets/Scripts/UI/EndScreen.cs


Instantiate(prefab, parent).winnerTeamName = winnerTeamName;
}
void Start()
void OnEnable()
{
// Retrieving interesting elements to:
// 1- set values

winnerIsLabel = rootVisualElement.Q<Label>("winner-is-label");
winnerTeamNameLabel = rootVisualElement.Q<Label>("winner-label");
winnerTeamNameLabel.text = winnerTeamName + "!!";
}
private void Start()
{
winnerTeamNameLabel.text = winnerTeamName + "!!";
DoAnimations();
}

2
Assets/Scripts/UI/GameScreen.cs


{
private VisualElement cardPanel;
void Start()
void OnEnable()
{
cardPanel = GetComponent<UIDocument>().rootVisualElement.Q("cardpanel");
cardPanel.style.display = DisplayStyle.None;

13
Assets/Scripts/UI/HealthBar.cs


using UnityEngine;
using System;
using UnityEngine;
using UnityEngine.UIElements;
namespace UnityRoyale

transformToFollow = p.transform;
}
void Start()
void OnEnable()
bar.style.unityBackgroundImageTintColor = barColor;
}
private void Start()
{
bar.style.unityBackgroundImageTintColor = barColor;
public void SetHealth(float newHealth)
{
currentHealth = newHealth;

10
Packages/manifest.json


{
"dependencies": {
"com.unity.addressables": "1.12.0",
"com.unity.addressables": "1.14.2",
"com.unity.ide.rider": "2.0.5",
"com.unity.ide.rider": "2.0.7",
"com.unity.textmeshpro": "3.0.0-preview.1",
"com.unity.textmeshpro": "3.0.1",
"com.unity.ui": "1.0.0-preview.6",
"com.unity.ui.builder": "1.0.0-preview.3",
"com.unity.ui": "1.0.0-preview.8",
"com.unity.ui.builder": "1.0.0-preview.6",
"com.unity.vectorgraphics": "2.0.0-preview.12",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",

19
Packages/packages-lock.json


"dependencies": {}
},
"com.unity.addressables": {
"version": "1.12.0",
"version": "1.14.2",
"com.unity.scriptablebuildpipeline": "1.9.0",
"com.unity.scriptablebuildpipeline": "1.11.1",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.unitywebrequestassetbundle": "1.0.0"

"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "2.0.5",
"version": "2.0.7",
"depth": 0,
"source": "registry",
"dependencies": {

"url": "https://packages.unity.com"
},
"com.unity.scriptablebuildpipeline": {
"version": "1.9.0",
"version": "1.11.1",
"depth": 1,
"source": "registry",
"dependencies": {},

"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.14",
"version": "1.1.16",
"depth": 1,
"source": "registry",
"dependencies": {

"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "3.0.0-preview.1",
"version": "3.0.1",
"depth": 0,
"source": "registry",
"dependencies": {

"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0"
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0"
"version": "1.0.0-preview.6",
"version": "1.0.0-preview.8",
"depth": 0,
"source": "registry",
"dependencies": {

"url": "https://packages.unity.com"
},
"com.unity.ui.builder": {
"version": "1.0.0-preview.3",
"version": "1.0.0-preview.6",
"depth": 0,
"source": "registry",
"dependencies": {},

64
ProjectSettings/ProjectSettings.asset


--- !u!129 &1
PlayerSettings:
m_ObjectHideFlags: 0
serializedVersion: 20
serializedVersion: 21
productGUID: 84e51f6c7175d984cbd18a5412e170cf
AndroidProfiler: 0
AndroidFilterTouchesWhenObscured: 0

switchNVNShaderPoolsGranularity: 33554432
switchNVNDefaultPoolsGranularity: 16777216
switchNVNOtherPoolsGranularity: 16777216
switchNVNMaxPublicTextureIDCount: 0
switchNVNMaxPublicSamplerIDCount: 0
vulkanEnablePreTransform: 0
vulkanEnableLateAcquireNextImage: 0
m_SupportedAspectRatios:
4:3: 0
5:4: 0

xboxOneDisableKinectGpuReservation: 0
xboxOneEnable7thCore: 0
vrSettings:
cardboard:
depthFormat: 0
enableTransitionView: 0
daydream:
depthFormat: 0
useSustainedPerformanceMode: 0
enableVideoLayer: 0
useProtectedVideoMemory: 0
minimumSupportedHeadTracking: 0
maximumSupportedHeadTracking: 1
hololens:
depthFormat: 1
depthBufferSharingEnabled: 0
lumin:
depthFormat: 0
frameTiming: 2
enableGLCache: 0
glCacheMaxBlobSize: 524288
glCacheMaxFileSize: 8388608
oculus:
sharedDepthBuffer: 0
dashSupport: 0
lowOverheadMode: 0
protectedContext: 0
v2Signing: 1
enable360StereoCapture: 0
isWsaHolographicRemotingEnabled: 0
enableFrameTimingStats: 0

applicationIdentifier:
Android: com.unity.uitoolkit.unityroyale
Standalone: com.Unity.UTD
buildNumber: {}
buildNumber:
Standalone: 0
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 0
AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 23
AndroidTargetSdkVersion: 28

iOSLaunchScreeniPadFillPct: 100
iOSLaunchScreeniPadSize: 100
iOSLaunchScreeniPadCustomXibPath:
iOSUseLaunchScreenStoryboard: 0
iOSLaunchScreeniPadCustomStoryboardPath:
iOSDeviceRequirements: []
iOSURLSchemes: []
iOSBackgroundModes: 0

clonedFromGUID: 9870af204204ab84596f8a656f2f2ce6
templatePackageId: com.unity.template.lightweight@1.0.2
templateDefaultScene: Assets/Scenes/SampleScene.unity
useCustomMainManifest: 0
useCustomLauncherManifest: 0
useCustomMainGradleTemplate: 0
useCustomLauncherGradleManifest: 0
useCustomBaseGradleTemplate: 0
useCustomGradlePropertiesTemplate: 0
useCustomProguardFile: 0
AndroidTargetArchitectures: 5
AndroidSplashScreenScale: 2
androidSplashScreen: {fileID: 0}

m_BuildTargetGraphicsAPIs:
- m_BuildTarget: iOSSupport
m_APIs: 10000000
m_Automatic: 0
m_Automatic: 1
m_Automatic: 0
m_Automatic: 1
- m_BuildTarget: AndroidPlayer
m_APIs: 150000000b000000
m_Automatic: 0

- m_BuildTarget: Android
m_TextureStreamingEnabled: 1
m_TextureStreamingPriority: 0
m_BuildTargetNormalMapEncoding: []
playModeTestRunnerEnabled: 0
runPlayModeTestAsEditModeTest: 0
actionOnDotNetUnhandledException: 1

switchSocketInitializeEnabled: 1
switchNetworkInterfaceManagerInitializeEnabled: 1
switchPlayerConnectionEnabled: 1
switchUseNewStyleFilepaths: 0
ps4NPAgeRating: 12
ps4NPTitleSecret:
ps4NPTrophyPackPath:

ps4ShareFilePath:
ps4ShareOverlayImagePath:
ps4PrivacyGuardImagePath:
ps4ExtraSceSysFile:
ps4NPtitleDatPath:
ps4RemotePlayKeyAssignment: -1
ps4RemotePlayKeyMappingDir:

ps4disableAutoHideSplash: 0
ps4videoRecordingFeaturesUsed: 0
ps4contentSearchFeaturesUsed: 0
ps4CompatibilityPS5: 0
ps4GPU800MHz: 1
ps4attribEyeToEyeDistanceSettingVR: 0
ps4IncludedModules: []
ps4attribVROutputEnabled: 0

27: UNITY_POST_PROCESSING_STACK_V2
28: UNITY_POST_PROCESSING_STACK_V2
29: UNITY_POST_PROCESSING_STACK_V2
30: UNITY_POST_PROCESSING_STACK_V2
platformArchitecture: {}
scriptingBackend: {}
il2cppCompilerConfiguration: {}

useDeterministicCompilation: 1
useReferenceAssemblies: 1
enableRoslynAnalyzers: 1
additionalIl2CppArgs:
scriptingRuntimeVersion: 1
gcIncremental: 1

XboxOneXTitleMemory: 8
XboxOneOverrideIdentityName:
XboxOneOverrideIdentityPublisher:
vrEditorSettings:
daydream:
daydreamIconForeground: {fileID: 0}
daydreamIconBackground: {fileID: 0}
vrEditorSettings: {}
cloudServicesEnabled:
UNet: 1
luminIcon:

apiCompatibilityLevel: 6
cloudProjectId:
framebufferDepthMemorylessMode: 0
qualitySettingsNames: []
projectName:
organizationId:
cloudEnabled: 0

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2020.1.0f1
m_EditorVersionWithRevision: 2020.1.0f1 (2ab9c4179772)
m_EditorVersion: 2020.1.6f1
m_EditorVersionWithRevision: 2020.1.6f1 (fc477ca6df10)

7
UserSettings/EditorUserSettings.asset


m_ObjectHideFlags: 0
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c72111f19563f22213229
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0

m_SemanticMergeMode: 2
m_VCShowFailedCheckout: 1
m_VCOverwriteFailedCheckoutAssets: 1
m_VCOverlayIcons: 1
m_VCProjectOverlayIcons: 1
m_VCHierarchyOverlayIcons: 1
m_VCOtherOverlayIcons: 1
m_VCAllowAsyncUpdate: 0

8
Assets/StreamingAssets.meta


fileFormatVersion: 2
guid: 223a107d505694ce59977f8aefb12829
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

43
ProjectSettings/PackageManagerSettings.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &1
MonoBehaviour:
m_ObjectHideFlags: 61
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: 13964, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_EnablePreviewPackages: 0
m_EnablePackageDependencies: 0
m_AdvancedSettingsExpanded: 1
m_ScopedRegistriesSettingsExpanded: 1
oneTimeWarningShown: 0
m_Registries:
- m_Id: main
m_Name:
m_Url: https://packages.unity.com
m_Scopes: []
m_IsDefault: 1
m_Capabilities: 7
m_UserSelectedRegistryName:
m_UserAddingNewScopedRegistry: 0
m_RegistryInfoDraft:
m_ErrorMessage:
m_Original:
m_Id:
m_Name:
m_Url:
m_Scopes: []
m_IsDefault: 0
m_Capabilities: 0
m_Modified: 0
m_Name:
m_Url:
m_Scopes:
-
m_SelectedScopeIndex: 0
正在加载...
取消
保存