浏览代码

Unity 2021 upgrade and NGO Update

/main/staging/2021_Upgrade
当前提交
eea9bb46
共有 12 个文件被更改,包括 128 次插入63 次删除
  1. 21
      Assets/Art/Glyph/Symbols.png.meta
  2. 9
      Assets/Art/Icons/ClickParticleMat.mat
  3. 13
      Assets/Prefabs/Runes/icon_particle.mat
  4. 21
      Assets/Renderer/glyphGameURP.asset
  5. 2
      Assets/Scripts/GameLobby/NGO/PlayerCursor.cs
  6. 1
      Assets/Scripts/GameLobby/NGO/SetupInGame.cs
  7. 9
      Packages/manifest.json
  8. 78
      Packages/packages-lock.json
  9. 4
      ProjectSettings/ProjectVersion.txt
  10. 2
      ProjectSettings/URPProjectSettings.asset
  11. 15
      ProjectSettings/RiderScriptEditorPersistedState.asset
  12. 16
      ProjectSettings/ShaderGraphSettings.asset

21
Assets/Art/Glyph/Symbols.png.meta


streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0

edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
17_elemental: -2657090017763772448
4_matter: -612294750349367285
5_gas: 4906567379933833492
7_star: 4588468031203458904
2_cold: -469525390435789673
entropy: 5531826651420068725
10_life: 6472110944188623208
9_planet: -5148847302637816175
13_mind: -2962330253262605572
16_evil: -5893568625793066583
1_heat: -3739395637988037281
15_good: -431797579490579562
0_gravity: 8720604468809159126
8_system: 4830219810074551288
6_water: 8796499958254778168
14_moon: -5670611702303752676
3_entanglement: -5196480314518052078
12_expansion: -5943722948072908530
11_radiation: -2449591561013552763
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0

9
Assets/Art/Icons/ClickParticleMat.mat


m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 4
version: 5
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}

m_ShaderKeywords: _ALPHATEST_ON
m_ValidKeywords:
- _ALPHATEST_ON
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 1
- _Blend: 0

13
Assets/Prefabs/Runes/icon_particle.mat


%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}

m_ShaderKeywords: _ALPHATEST_ON _COLORADDSUBDIFF_ON
m_ValidKeywords:
- _ALPHATEST_ON
- _COLORADDSUBDIFF_ON
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords:
- _FLIPBOOKBLENDING_OFF
m_LightmapFlags: 6
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:

m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 1
- _Blend: 0

m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 4
version: 5

21
Assets/Renderer/glyphGameURP.asset


m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
m_Name: glyphGameURP
m_EditorClassIdentifier:
k_AssetVersion: 5
k_AssetPreviousVersion: 5
k_AssetVersion: 9
k_AssetPreviousVersion: 9
m_RendererType: 1
m_RendererData: {fileID: 0}
m_RendererDataList:

m_RequireOpaqueTexture: 0
m_OpaqueDownsampling: 1
m_SupportsTerrainHoles: 1
m_StoreActionsOptimization: 0
m_UpscalingFilter: 0
m_FsrOverrideSharpness: 0
m_FsrSharpness: 0.92
m_MainLightRenderingMode: 1
m_MainLightShadowsSupported: 1
m_MainLightShadowmapResolution: 2048

m_AdditionalLightsShadowmapResolution: 512
m_AdditionalLightsShadowResolutionTierLow: 128
m_AdditionalLightsShadowResolutionTierMedium: 256
m_AdditionalLightsShadowResolutionTierHigh: 512
m_ReflectionProbeBlending: 0
m_ReflectionProbeBoxProjection: 0
m_CascadeBorder: 0.1
m_ConservativeEnclosingSphere: 0
m_NumIterationsEnclosingSphere: 64
m_AdditionalLightsCookieResolution: 2048
m_AdditionalLightsCookieFormat: 3
m_SupportsLightLayers: 0
m_UseFastSRGBLinearConversion: 0
m_ShadowType: 1
m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256

m_VolumeFrameworkUpdateMode: 0
m_ShadowCascades: 0

2
Assets/Scripts/GameLobby/NGO/PlayerCursor.cs


[SerializeField] private ParticleSystem m_onClickParticles = default;
[SerializeField] private TMPro.TMP_Text m_nameOutput = default;
private Camera m_mainCamera;
private NetworkVariable<Vector3> m_position = new NetworkVariable<Vector3>(NetworkVariableReadPermission.Everyone, Vector3.zero); // (Using a NetworkTransform to sync position would also work.)
private NetworkVariable<Vector3> m_position = new NetworkVariable<Vector3>( Vector3.zero); // (Using a NetworkTransform to sync position would also work.)
private ulong m_localId;
// If the local player cursor spawns before this cursor's owner, the owner's data won't be available yet. This is used to retrieve the data later.

1
Assets/Scripts/GameLobby/NGO/SetupInGame.cs


using System;
using Unity.Netcode;
using Unity.Netcode.Transports.UTP;
using UnityEngine;
namespace LobbyRelaySample.ngo

9
Packages/manifest.json


{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.collab-proxy": "1.15.13",
"com.unity.collab-proxy": "1.15.15",
"com.unity.ide.rider": "3.0.7",
"com.unity.ide.rider": "3.0.13",
"com.unity.netcode.adapter.utp": "1.0.0-pre.3",
"com.unity.netcode.gameobjects": "1.0.0-pre.2",
"com.unity.netcode.gameobjects": "1.0.0-pre.9",
"com.unity.render-pipelines.universal": "10.8.1",
"com.unity.render-pipelines.universal": "12.1.6",
"com.unity.services.authentication": "1.0.0-pre.37",
"com.unity.services.core": "1.2.0",
"com.unity.services.lobby": "1.0.0-pre.7",

78
Packages/packages-lock.json


"dependencies": {}
},
"com.unity.burst": {
"version": "1.5.5",
"version": "1.6.5",
"depth": 1,
"source": "registry",
"dependencies": {

},
"com.unity.collab-proxy": {
"version": "1.15.13",
"version": "1.15.15",
"depth": 0,
"source": "registry",
"dependencies": {

},
"com.unity.collections": {
"version": "1.1.0",
"depth": 1,
"version": "1.2.3",
"depth": 2,
"com.unity.burst": "1.5.4",
"com.unity.test-framework": "1.1.29"
"com.unity.burst": "1.6.4",
"com.unity.test-framework": "1.1.31"
},
"url": "https://packages.unity.com"
},

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

"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
"version": "1.2.1",
"version": "1.2.5",
"com.unity.netcode.adapter.utp": {
"version": "1.0.0-pre.3",
"com.unity.netcode.gameobjects": {
"version": "1.0.0-pre.9",
"com.unity.netcode.gameobjects": "1.0.0-pre.3",
"com.unity.transport": "1.0.0-pre.7"
},
"url": "https://packages.unity.com"
},
"com.unity.netcode.gameobjects": {
"version": "1.0.0-pre.3",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.collections": "1.0.0-pre.5"
"com.unity.transport": "1.0.0"
},
"url": "https://packages.unity.com"
},

"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": {
"version": "10.8.1",
"version": "12.1.6",
"source": "registry",
"source": "builtin",
},
"url": "https://packages.unity.com"
}
"version": "10.8.1",
"version": "12.1.6",
"source": "registry",
"source": "builtin",
"com.unity.mathematics": "1.1.0",
"com.unity.render-pipelines.core": "10.8.1",
"com.unity.shadergraph": "10.8.1"
},
"url": "https://packages.unity.com"
"com.unity.mathematics": "1.2.1",
"com.unity.burst": "1.5.0",
"com.unity.render-pipelines.core": "12.1.6",
"com.unity.shadergraph": "12.1.6"
}
"version": "4.3.2",
"version": "4.9.1",
"depth": 2,
"source": "registry",
"dependencies": {},

"url": "https://packages.unity.com"
},
"com.unity.shadergraph": {
"version": "10.8.1",
"version": "12.1.6",
"source": "registry",
"source": "builtin",
"com.unity.render-pipelines.core": "10.8.1",
"com.unity.searcher": "4.3.2"
},
"url": "https://packages.unity.com"
"com.unity.render-pipelines.core": "12.1.6",
"com.unity.searcher": "4.9.1"
}
},
"com.unity.sysroot": {
"version": "0.1.19-preview",

"url": "https://packages.unity.com"
},
"com.unity.transport": {
"version": "1.0.0-pre.9",
"depth": 0,
"version": "1.0.0",
"depth": 1,
"com.unity.collections": "1.1.0",
"com.unity.burst": "1.5.5",
"com.unity.mathematics": "1.2.1"
"com.unity.collections": "1.2.3",
"com.unity.burst": "1.6.4",
"com.unity.mathematics": "1.2.5"
},
"url": "https://packages.unity.com"
},

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2020.3.31f1
m_EditorVersionWithRevision: 2020.3.31f1 (6b54b7616050)
m_EditorVersion: 2021.2.19f1
m_EditorVersionWithRevision: 2021.2.19f1 (602ecdbb2fb0)

2
ProjectSettings/URPProjectSettings.asset


m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3}
m_Name:
m_EditorClassIdentifier:
m_LastMaterialVersion: 4
m_LastMaterialVersion: 5

15
ProjectSettings/RiderScriptEditorPersistedState.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: 0}
m_Name:
m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState
lastWriteTicks: -8585493176933029365

16
ProjectSettings/ShaderGraphSettings.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: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3}
m_Name:
m_EditorClassIdentifier:
customInterpolatorErrorThreshold: 32
customInterpolatorWarningThreshold: 16
正在加载...
取消
保存