比较提交

...
此合并请求有变更与目标分支冲突。
/Assets/Settings/LWRP_Pipe_Asset.asset
/Assets/UI/UnityRoyalePanelSettings.asset
/Packages/manifest.json
/Packages/packages-lock.json
/ProjectSettings/ProjectVersion.txt

2 次代码提交

作者 SHA1 备注 提交日期
Julia Perdigueiro acefa694 Updating to use with 2021.2 3 年前
Julia Perdigueiro 0efdf547 Updating to use with 2021.2 3 年前
共有 18 个文件被更改,包括 124 次插入155 次删除
  1. 4
      Assets/Scenes/Main.unity
  2. 25
      Assets/Scenes/TitleScreen.unity
  3. 33
      Assets/Scripts/UI/HealthBar.cs
  4. 13
      Assets/Settings/CustomForwardRendererData.asset
  5. 5
      Assets/Settings/LWRP_Pipe_Asset.asset
  6. 22
      Assets/TextMesh Pro/Sprites/EmojiOne.png.meta
  7. 2
      Assets/UI Toolkit/Default UITK Text Settings.asset
  8. 2
      Assets/UI/Prefabs/EndScreen.prefab
  9. 2
      Assets/UI/Prefabs/HealthBar.prefab
  10. 12
      Assets/UI/UnityRoyalePanelSettings.asset
  11. 15
      Packages/manifest.json
  12. 111
      Packages/packages-lock.json
  13. 9
      ProjectSettings/ProjectSettings.asset
  14. 4
      ProjectSettings/ProjectVersion.txt
  15. 6
      UserSettings/EditorUserSettings.asset
  16. 2
      Assets/UI/UnityDefaultRuntimeTheme.tss
  17. 11
      Assets/UI/UnityDefaultRuntimeTheme.tss.meta
  18. 1
      UserSettings/Search.settings

4
Assets/Scenes/Main.unity


m_GameObject: {fileID: 8409944646904557770}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f21c074d86024caca2a0034ce4f53f73, type: 3}
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_PanelSettings: {fileID: 11400000, guid: 5adb043d2f1ac664f95f8ebd985208c5, type: 2}

m_GameObject: {fileID: 9031842704942719471}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f21c074d86024caca2a0034ce4f53f73, type: 3}
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_PanelSettings: {fileID: 11400000, guid: 5adb043d2f1ac664f95f8ebd985208c5, type: 2}

25
Assets/Scenes/TitleScreen.unity


m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:

m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &298468617

serializedVersion: 6
m_Component:
- component: {fileID: 1279655996}
- component: {fileID: 1279655997}
- component: {fileID: 1279655995}
m_Layer: 0
m_Name: TitleScreenManager

m_GameObject: {fileID: 1279655994}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f21c074d86024caca2a0034ce4f53f73, type: 3}
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_PanelSettings: {fileID: 11400000, guid: 5adb043d2f1ac664f95f8ebd985208c5, type: 2}

m_SortingOrder: 0
--- !u!4 &1279655996
Transform:
m_ObjectHideFlags: 0

m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1279655997
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1279655994}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: afe6c4600f907e64ca01409d01326a60, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5

33
Assets/Scripts/UI/HealthBar.cs


void OnEnable()
{
var rootVisualElement = GetComponent<UIDocument>().rootVisualElement;
bar = rootVisualElement.Q("Bar");
wholeWidget = rootVisualElement.Q("HealthBar");
// TODO remove this check after the execution order is fixed!
if (rootVisualElement != null)
{
bar = rootVisualElement.Q("Bar");
wholeWidget = rootVisualElement.Q("HealthBar");
}
// TODO remove this check after the execution order is fixed!
if (bar == null)
{
return;
}
bar.style.unityBackgroundImageTintColor = barColor;
SetHealth(currentHealth);
}

private void Update()
{
// TODO remove this check after the execution order is fixed!
if (bar == null)
{
var rootVisualElement = GetComponent<UIDocument>().rootVisualElement;
if (rootVisualElement != null)
{
bar = rootVisualElement.Q("Bar");
wholeWidget = rootVisualElement.Q("HealthBar");
bar.style.unityBackgroundImageTintColor = barColor;
SetHealth(currentHealth);
}
}
wholeWidget.EnableInClassList(HiddenHealthBarStyleClass, isHidden);
}

{
// TODO remove this check after the execution order is fixed!
if (bar == null)
{
return;
}
if (!isHidden && transformToFollow != null)
{
MoveAndScaleToWorldPosition(wholeWidget, transformToFollow.position + anchorPosition, worldSize);

13
Assets/Settings/CustomForwardRendererData.asset


m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
m_Script: {fileID: 11500000, guid: f971995892640ec4f807ef396269e91e, type: 3}
m_Name: CustomForwardRendererData
m_EditorClassIdentifier:
m_RendererFeatures:

m_RendererFeatureMap:
m_UseNativeRenderPass: 0
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
shaders:

type: 3}
samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
tileDepthInfoPS: {fileID: 4800000, guid: f451c6bec16aa51408bdfd37f70aed12, type: 3}
tileDeferredPS: {fileID: 4800000, guid: 344787727e03649488a1022c09fa74b5, type: 3}
m_Bits: 3895
m_Bits: 4294967295
m_Bits: 3895
m_Bits: 4294967295
stencilReference: 1
stencilReference: 0
passOperation: 0
passOperation: 2
failOperation: 0
zFailOperation: 0
m_ShadowTransparentReceive: 1

5
Assets/Settings/LWRP_Pipe_Asset.asset


m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
m_Name: LWRP_Pipe_Asset
m_EditorClassIdentifier:
k_AssetVersion: 7
k_AssetPreviousVersion: 7
k_AssetVersion: 8
k_AssetPreviousVersion: 8
m_RendererType: 0
m_RendererData: {fileID: 11400000, guid: 01ef2771b975f45e29bd82cba55599e1, type: 2}
m_RendererDataList:

m_Cascade2Split: 0.25
m_Cascade3Split: {x: 0.1, y: 0.3}
m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
m_CascadeBorder: 0.1
m_ShadowDepthBias: 0.3
m_ShadowNormalBias: 0.2
m_SoftShadowsSupported: 1

22
Assets/TextMesh Pro/Sprites/EmojiOne.png.meta


maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1

edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
EmojiOne_3: 21300006
EmojiOne_1: 21300002
EmojiOne_9: 21300016
EmojiOne_13: 21300024
EmojiOne_7: 21300012
EmojiOne_2: 21300004
EmojiOne_10: 21300018
EmojiOne_0: 21300000
EmojiOne_4: 21300008
EmojiOne_5: 21300026
EmojiOne_6: 21300010
EmojiOne_8: 21300014
EmojiOne_14: 21300028
EmojiOne_11: 21300020
EmojiOne_12: 21300022
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0

2
Assets/UI Toolkit/Default UITK Text Settings.asset


m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 83edbd52c03fc4d319804b472b97f952, type: 3}
m_Script: {fileID: 19103, guid: 0000000000000000e000000000000000, type: 0}
m_Name: Default UITK Text Settings
m_EditorClassIdentifier:
m_Version:

2
Assets/UI/Prefabs/EndScreen.prefab


m_GameObject: {fileID: 1287572586156800699}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f21c074d86024caca2a0034ce4f53f73, type: 3}
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_PanelSettings: {fileID: 11400000, guid: 5adb043d2f1ac664f95f8ebd985208c5, type: 2}

2
Assets/UI/Prefabs/HealthBar.prefab


m_GameObject: {fileID: 1287572586156800699}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f21c074d86024caca2a0034ce4f53f73, type: 3}
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_PanelSettings: {fileID: 11400000, guid: 5adb043d2f1ac664f95f8ebd985208c5, type: 2}

12
Assets/UI/UnityRoyalePanelSettings.asset


m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 782f629a2df6243629ea8fe2873666a4, type: 3}
m_Script: {fileID: 19101, guid: 0000000000000000e000000000000000, type: 0}
themeUss: {fileID: 11400000, guid: f567955c754d54a108d615cb51ccbf2f, type: 2}
themeUss: {fileID: -4733365628477956816, guid: 80a622799fe1849639475b8820197f1e,
type: 3}
m_TargetTexture: {fileID: 0}
m_ScaleMode: 0
m_Scale: 1

m_MaxAtlasSize: 4096
m_MaxSubTextureSize: 64
m_ActiveFilters: 31
m_AtlasBlitShader: {fileID: 4800000, guid: 662b00f569c02f84bbc426d4c41ceb5e, type: 3}
m_RuntimeShader: {fileID: 4800000, guid: 1e5f18a346ed454418f93aa7eaf55791, type: 3}
m_RuntimeWorldShader: {fileID: 4800000, guid: 7082954141e3ccc43bc3b217cf12e2e0,
type: 3}
m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0}
m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0}
textSettings: {fileID: 11400000, guid: fb48f3b3eecb047e88a6667306380d19, type: 2}

15
Packages/manifest.json


{
"dependencies": {
"com.unity.addressables": "1.16.15",
"com.unity.cinemachine": "2.7.1",
"com.unity.ide.rider": "3.0.3",
"com.unity.ide.visualstudio": "2.0.5",
"com.unity.addressables": "1.16.16",
"com.unity.cinemachine": "2.7.2",
"com.unity.ide.rider": "3.0.5",
"com.unity.ide.visualstudio": "2.0.7",
"com.unity.render-pipelines.lightweight": "10.1.0",
"com.unity.textmeshpro": "3.0.3",
"com.unity.timeline": "1.5.1-pre.3",
"com.unity.textmeshpro": "3.0.4",
"com.unity.timeline": "1.6.0-pre.3",
"com.unity.ui": "1.0.0-preview.14",
"com.unity.ui.builder": "1.0.0-preview.12",
"com.unity.vectorgraphics": "2.0.0-preview.12",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",

111
Packages/packages-lock.json


"dependencies": {}
},
"com.unity.addressables": {
"version": "1.16.15",
"version": "1.16.16",
"com.unity.scriptablebuildpipeline": "1.15.1",
"com.unity.scriptablebuildpipeline": "1.15.2",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.unitywebrequestassetbundle": "1.0.0"

"com.unity.cinemachine": {
"version": "2.7.1",
"version": "2.7.2",
"depth": 0,
"source": "registry",
"dependencies": {},

"version": "1.0.5",
"version": "1.0.6",
"depth": 2,
"source": "registry",
"dependencies": {},

"version": "3.0.3",
"version": "3.0.5",
"dependencies": {
"com.unity.test-framework": "1.1.1"
},
"dependencies": {},
"version": "2.0.5",
"version": "2.0.7",
"dependencies": {},
"dependencies": {
"com.unity.test-framework": "1.1.9"
},
"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {

"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
"version": "1.2.1",
"depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.postprocessing": {
"version": "3.0.2",
"depth": 1,
"source": "builtin",
"dependencies": {}
},
"com.unity.render-pipelines.core": {
"version": "11.0.0",
"depth": 2,
"source": "builtin",
"dependencies": {
"com.unity.ugui": "1.0.0"
}
},
"com.unity.render-pipelines.lightweight": {
"version": "10.1.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.render-pipelines.universal": "10.1.0",
"com.unity.postprocessing": "2.1.7"
},
"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.universal": {
"version": "11.0.0",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.mathematics": "1.1.0",
"com.unity.render-pipelines.core": "11.0.0",
"com.unity.shadergraph": "11.0.0"
}
},
"version": "1.15.1",
"version": "1.16.1",
"com.unity.searcher": {
"version": "4.3.1",
"depth": 3,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.shadergraph": {
"version": "11.0.0",
"depth": 2,
"source": "builtin",
"dependencies": {
"com.unity.render-pipelines.core": "11.0.0",
"com.unity.searcher": "4.3.1"
}
},
"version": "1.1.19",
"version": "1.1.24",
"com.unity.ext.nunit": "1.0.5",
"com.unity.ext.nunit": "1.0.6",
"com.unity.textcore": {
"version": "1.0.0-preview.2",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"version": "3.0.3",
"version": "3.0.4",
"depth": 0,
"source": "registry",
"dependencies": {

},
"com.unity.timeline": {
"version": "1.5.1-pre.3",
"version": "1.6.0-pre.3",
"depth": 0,
"source": "registry",
"dependencies": {

"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0"
}
},
"com.unity.ui": {
"version": "1.0.0-preview.14",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.uielementsnative": "1.0.0",
"com.unity.textcore": "1.0.0-preview.2"
},
"url": "https://packages.unity.com"
},
"com.unity.ui.builder": {
"version": "1.0.0-preview.12",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.vectorgraphics": {
"version": "2.0.0-preview.12",

9
ProjectSettings/ProjectSettings.asset


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

m_Automatic: 1
- m_BuildTarget: AndroidPlayer
m_APIs: 150000000b000000
m_Automatic: 0
m_Automatic: 1
- m_BuildTarget: WebGLSupport
m_APIs: 0b000000
m_Automatic: 0

switchTitleNames_12:
switchTitleNames_13:
switchTitleNames_14:
switchTitleNames_15:
switchPublisherNames_0:
switchPublisherNames_1:
switchPublisherNames_2:

switchPublisherNames_12:
switchPublisherNames_13:
switchPublisherNames_14:
switchPublisherNames_15:
switchIcons_0: {fileID: 0}
switchIcons_1: {fileID: 0}
switchIcons_2: {fileID: 0}

switchIcons_12: {fileID: 0}
switchIcons_13: {fileID: 0}
switchIcons_14: {fileID: 0}
switchIcons_15: {fileID: 0}
switchSmallIcons_0: {fileID: 0}
switchSmallIcons_1: {fileID: 0}
switchSmallIcons_2: {fileID: 0}

switchSmallIcons_12: {fileID: 0}
switchSmallIcons_13: {fileID: 0}
switchSmallIcons_14: {fileID: 0}
switchSmallIcons_15: {fileID: 0}
switchManualHTML:
switchAccessibleURLs:
switchLegalInformation:

31: UNITY_POST_PROCESSING_STACK_V2
32: UNITY_POST_PROCESSING_STACK_V2
33: UNITY_POST_PROCESSING_STACK_V2
34: UNITY_POST_PROCESSING_STACK_V2
additionalCompilerArguments: {}
platformArchitecture: {}
scriptingBackend: {}

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2021.1.0b3
m_EditorVersionWithRevision: 2021.1.0b3 (202fb86be42c)
m_EditorVersion: 2021.2.0a10
m_EditorVersionWithRevision: 2021.2.0a10 (73cce8c7d9b3)

6
UserSettings/EditorUserSettings.asset


RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c6b19021b1d192f3a23352367083debf42d
flags: 0
RecentlyUsedScenePath-2:
value: 0003045652040d585b0a5f7648770949144f1e7c7b717160292a4b64e0e53061
flags: 0
RecentlyUsedScenePath-3:
value: 0652040350000b595b0d597741200e44454e4d2c7e7e7567747a1b62bbb83660
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0

2
Assets/UI/UnityDefaultRuntimeTheme.tss


@import url("unity-theme://default");
VisualElement {}

11
Assets/UI/UnityDefaultRuntimeTheme.tss.meta


fileFormatVersion: 2
guid: 80a622799fe1849639475b8820197f1e
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 12388, guid: 0000000000000000e000000000000000, type: 0}
disableValidation: 0

1
UserSettings/Search.settings


{}
正在加载...
取消
保存