Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
MDPro3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Surveil
MDPro3
Commits
7c2c967f
Commit
7c2c967f
authored
Jul 13, 2024
by
SherryChaos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade Unity to 6000.0.10f1
parent
ccfa5109
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
24 additions
and
31 deletions
+24
-31
Assets/Addressables/Text/UpdateContent.txt
Assets/Addressables/Text/UpdateContent.txt
+4
-0
Assets/Resources/Settings/UniversalRenderPipelineGlobalSettings.asset
...rces/Settings/UniversalRenderPipelineGlobalSettings.asset
+3
-12
Assets/Scripts/MDPro3/Managers/TextureManager.cs
Assets/Scripts/MDPro3/Managers/TextureManager.cs
+8
-10
Packages/manifest.json
Packages/manifest.json
+2
-2
Packages/packages-lock.json
Packages/packages-lock.json
+4
-4
ProjectSettings/ProjectSettings.asset
ProjectSettings/ProjectSettings.asset
+1
-1
ProjectSettings/ProjectVersion.txt
ProjectSettings/ProjectVersion.txt
+2
-2
No files found.
Assets/Addressables/Text/UpdateContent.txt
View file @
7c2c967f
MDPro3 v1.1.6.2更新:
1.修复场地设置不为[随机]的情况下,其他选项设为[与场地一致]时无法进入决斗的错误 。
MDPro3 v1.1.6.1更新:
1.修复部分卡片效果特效[灰流丽等]不播放的错误;
2.修复多端同步MyCard卡组时,删除的卡组死灰复燃、生生不息的错误。
...
...
Assets/Resources/Settings/UniversalRenderPipelineGlobalSettings.asset
View file @
7c2c967f
...
...
@@ -55,18 +55,7 @@ MonoBehaviour:
-
rid
:
5650211206403981529
-
rid
:
5650211206403981530
m_RuntimeSettings
:
m_List
:
-
rid
:
5650211206403981510
-
rid
:
5650211206403981511
-
rid
:
5650211206403981512
-
rid
:
5650211206403981514
-
rid
:
5650211206403981515
-
rid
:
5650211206403981518
-
rid
:
5650211206403981520
-
rid
:
5650211206403981522
-
rid
:
5650211206403981528
-
rid
:
5650211206403981529
-
rid
:
5650211206403981530
m_List
:
[]
m_AssetVersion
:
8
m_ObsoleteDefaultVolumeProfile
:
{
fileID
:
0
}
m_RenderingLayerNames
:
...
...
@@ -100,6 +89,7 @@ MonoBehaviour:
data
:
m_xrOcclusionMeshPS
:
{
fileID
:
4800000
,
guid
:
4431b1f1f743fbf4eb310a967890cbea
,
type
:
3
}
m_xrMirrorViewPS
:
{
fileID
:
4800000
,
guid
:
d5a307c014552314b9f560906d708772
,
type
:
3
}
m_xrMotionVector
:
{
fileID
:
4800000
,
guid
:
f89aac1e4f84468418fe30e611dff395
,
type
:
3
}
-
rid
:
5650211206403981512
type
:
{
class
:
UniversalRendererResources
,
ns
:
UnityEngine.Rendering.Universal
,
asm
:
Unity.RenderPipelines.Universal.Runtime
}
data
:
...
...
@@ -170,6 +160,7 @@ MonoBehaviour:
m_GeometryShadowShader
:
{
fileID
:
4800000
,
guid
:
19349a0f9a7ed4c48a27445bcf92e5e1
,
type
:
3
}
m_GeometryUnshadowShader
:
{
fileID
:
4800000
,
guid
:
77774d9009bb81447b048c907d4c6273
,
type
:
3
}
m_FallOffLookup
:
{
fileID
:
2800000
,
guid
:
5688ab254e4c0634f8d6c8e0792331ca
,
type
:
3
}
m_CopyDepthPS
:
{
fileID
:
4800000
,
guid
:
d6dae50ee9e1bfa4db75f19f99355220
,
type
:
3
}
m_DefaultCustomMaterial
:
{
fileID
:
2100000
,
guid
:
a97c105638bdf8b4a8650670310a4cd3
,
type
:
2
}
m_DefaultLitMaterial
:
{
fileID
:
2100000
,
guid
:
a97c105638bdf8b4a8650670310a4cd3
,
type
:
2
}
m_DefaultUnlitMaterial
:
{
fileID
:
2100000
,
guid
:
9dfc825aed78fcd4ba02077103263b40
,
type
:
2
}
...
...
Assets/Scripts/MDPro3/Managers/TextureManager.cs
View file @
7c2c967f
...
...
@@ -124,17 +124,15 @@ namespace MDPro3
#else
fullPath
=
Environment
.
CurrentDirectory
+
Program
.
slash
+
path
;
#endif
using
(
var
request
=
UnityWebRequestTexture
.
GetTexture
(
fullPath
))
{
await
request
.
SendWebRequest
();
using
var
request
=
UnityWebRequestTexture
.
GetTexture
(
fullPath
);
await
request
.
SendWebRequest
();
if
(
request
.
result
==
UnityWebRequest
.
Result
.
Success
)
return
DownloadHandlerTexture
.
GetContent
(
request
);
else
{
Debug
.
LogWarningFormat
(
"Pic File [{0}] not fount."
,
path
);
return
null
;
}
if
(
request
.
result
==
UnityWebRequest
.
Result
.
Success
)
return
DownloadHandlerTexture
.
GetContent
(
request
);
else
{
Debug
.
LogWarningFormat
(
"Pic File [{0}] not fount."
,
path
);
return
null
;
}
}
...
...
Packages/manifest.json
View file @
7c2c967f
...
...
@@ -5,7 +5,7 @@
"com.unity.addressables"
:
"2.1.0"
,
"com.unity.ai.navigation"
:
"2.0.0"
,
"com.unity.cinemachine"
:
"2.10.0"
,
"com.unity.collab-proxy"
:
"2.
3.1
"
,
"com.unity.collab-proxy"
:
"2.
4.3
"
,
"com.unity.ide.rider"
:
"3.0.28"
,
"com.unity.ide.visualstudio"
:
"2.0.22"
,
"com.unity.inputsystem"
:
"1.8.2"
,
...
...
@@ -13,7 +13,7 @@
"com.unity.nuget.newtonsoft-json"
:
"3.2.1"
,
"com.unity.render-pipelines.universal"
:
"17.0.3"
,
"com.unity.test-framework"
:
"1.4.4"
,
"com.unity.timeline"
:
"1.8.
6
"
,
"com.unity.timeline"
:
"1.8.
7
"
,
"com.unity.toolchain.win-x86_64-linux-x86_64"
:
"2.0.9"
,
"com.unity.ugui"
:
"2.0.0"
,
"com.yasirkula.nativefilepicker"
:
"https://github.com/yasirkula/UnityNativeFilePicker.git"
,
...
...
Packages/packages-lock.json
View file @
7c2c967f
...
...
@@ -38,7 +38,7 @@
"url"
:
"https://packages.unity.com"
},
"com.unity.burst"
:
{
"version"
:
"1.8.1
5
"
,
"version"
:
"1.8.1
6
"
,
"depth"
:
2
,
"source"
:
"registry"
,
"dependencies"
:
{
...
...
@@ -57,7 +57,7 @@
"url"
:
"https://packages.unity.com"
},
"com.unity.collab-proxy"
:
{
"version"
:
"2.
3.1
"
,
"version"
:
"2.
4.3
"
,
"depth"
:
0
,
"source"
:
"registry"
,
"dependencies"
:
{},
...
...
@@ -165,7 +165,7 @@
"com.unity.modules.physics"
:
"1.0.0"
,
"com.unity.modules.terrain"
:
"1.0.0"
,
"com.unity.modules.jsonserialize"
:
"1.0.0"
,
"com.unity.rendering.light-transport"
:
"1.0.
0
"
"com.unity.rendering.light-transport"
:
"1.0.
1
"
}
},
"com.unity.render-pipelines.universal"
:
{
...
...
@@ -257,7 +257,7 @@
"url"
:
"https://packages.unity.com"
},
"com.unity.timeline"
:
{
"version"
:
"1.8.
6
"
,
"version"
:
"1.8.
7
"
,
"depth"
:
0
,
"source"
:
"registry"
,
"dependencies"
:
{
...
...
ProjectSettings/ProjectSettings.asset
View file @
7c2c967f
...
...
@@ -551,7 +551,7 @@ PlayerSettings:
m_APIs
:
0b000000
m_Automatic
:
1
-
m_BuildTarget
:
WindowsStandaloneSupport
m_APIs
:
1500000002
000000
m_APIs
:
0200000015
000000
m_Automatic
:
0
m_BuildTargetVRSettings
:
-
m_BuildTarget
:
Standalone
...
...
ProjectSettings/ProjectVersion.txt
View file @
7c2c967f
m_EditorVersion: 6000.0.
5
f1
m_EditorVersionWithRevision: 6000.0.
5f1 (17028576122a
)
m_EditorVersion: 6000.0.
10
f1
m_EditorVersionWithRevision: 6000.0.
10f1 (413673acabac
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment