Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
VIZ.Package
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘龙飞
VIZ.Package
Commits
2bd1108b
Commit
2bd1108b
authored
Jun 09, 2023
by
liulongfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
暂时提交修改文件
parent
c7a41468
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
3 deletions
+26
-3
VIZ.Package.Module/Control/Controller/ControlController.cs
+5
-2
VIZ.Package.Service/Viz/VizCommandService.cs
+21
-1
No files found.
VIZ.Package.Module/Control/Controller/ControlController.cs
View file @
2bd1108b
...
@@ -47,6 +47,9 @@ namespace VIZ.Package.Module
...
@@ -47,6 +47,9 @@ namespace VIZ.Package.Module
this
.
vizCommandService
.
SetEnabledUpdate
(
conn
,
false
);
this
.
vizCommandService
.
SetEnabledUpdate
(
conn
,
false
);
try
try
{
{
// 清楚板子上的信息
this
.
vizCommandService
.
SetCue
(
conn
,
ApplicationDomainEx
.
CurrentPage
.
ScenePath
);
this
.
vizCommandService
.
SetObject
(
conn
,
ApplicationDomainEx
.
CurrentPage
.
ScenePath
,
ApplicationDomainEx
.
CurrentPage
.
Layer
);
this
.
vizCommandService
.
SetObject
(
conn
,
ApplicationDomainEx
.
CurrentPage
.
ScenePath
,
ApplicationDomainEx
.
CurrentPage
.
Layer
);
if
(
obj
!=
null
)
if
(
obj
!=
null
)
{
{
...
@@ -63,7 +66,7 @@ namespace VIZ.Package.Module
...
@@ -63,7 +66,7 @@ namespace VIZ.Package.Module
log
.
Error
(
ex
);
log
.
Error
(
ex
);
}
}
this
.
vizCommandService
.
SetEnabledUpdate
(
conn
,
true
);
this
.
vizCommandService
.
SetEnabledUpdate
(
conn
,
true
);
this
.
vizCommandService
.
Start
(
conn
,
ApplicationDomainEx
.
CurrentPage
.
Layer
);
this
.
vizCommandService
.
Start
(
conn
,
ApplicationDomainEx
.
CurrentPage
.
Layer
,
ApplicationDomainEx
.
CurrentPage
.
ScenePath
);
}
}
/// <summary>
/// <summary>
...
@@ -96,7 +99,7 @@ namespace VIZ.Package.Module
...
@@ -96,7 +99,7 @@ namespace VIZ.Package.Module
// 当前逻辑层场景是否为将要上的场景
// 当前逻辑层场景是否为将要上的场景
bool
isCurrent
=
!
string
.
IsNullOrWhiteSpace
(
transitionLogicLayer
.
SceneIdentifier
)
&&
string
.
Equals
(
transitionLogicLayer
.
SceneIdentifier
,
newPageBase
.
Scene
);
bool
isCurrent
=
!
string
.
IsNullOrWhiteSpace
(
transitionLogicLayer
.
SceneIdentifier
)
&&
string
.
Equals
(
transitionLogicLayer
.
SceneIdentifier
,
newPageBase
.
Scene
);
// 当前逻辑层是否被占用
// 当前逻辑层是否被占用
bool
isUsed
=
!
string
.
IsNullOrWhiteSpace
(
transitionLogicLayer
.
SceneIdentifier
);
bool
isUsed
=
string
.
IsNullOrWhiteSpace
(
transitionLogicLayer
.
SceneIdentifier
);
// 背景场景路径
// 背景场景路径
string
bgScenePath
=
$"
{
newPageBase
.
GetSceneParent
()}
/
{
newPageBase
.
BackgroundScene
}
"
;
string
bgScenePath
=
$"
{
newPageBase
.
GetSceneParent
()}
/
{
newPageBase
.
BackgroundScene
}
"
;
// 获取当前场景名
// 获取当前场景名
...
...
VIZ.Package.Service/Viz/VizCommandService.cs
View file @
2bd1108b
...
@@ -31,6 +31,19 @@ namespace VIZ.Package.Service
...
@@ -31,6 +31,19 @@ namespace VIZ.Package.Service
}
}
/// <summary>
/// <summary>
/// /清楚板子信息 根据trio CUE来的
/// </summary>
/// <param name="conn"></param>
/// <param name="scene"></param>
public
void
SetCue
(
ConnModel
conn
,
string
scene
)
{
if
(
string
.
IsNullOrEmpty
(
scene
))
return
;
conn
.
EndpointManager
.
Request
(
$"SCENE*
{
scene
}
CUE"
);
}
/// <summary>
/// 设置空场景
/// 设置空场景
/// </summary>
/// </summary>
/// <param name="conn">连接</param>
/// <param name="conn">连接</param>
...
@@ -276,10 +289,17 @@ namespace VIZ.Package.Service
...
@@ -276,10 +289,17 @@ namespace VIZ.Package.Service
/// </summary>
/// </summary>
/// <param name="conn">连接</param>
/// <param name="conn">连接</param>
/// <param name="layer">层</param>
/// <param name="layer">层</param>
public
void
Start
(
ConnModel
conn
,
VizLayer
layer
)
public
void
Start
(
ConnModel
conn
,
VizLayer
layer
,
string
scene
)
{
if
(
string
.
IsNullOrWhiteSpace
(
scene
))
{
{
conn
.
EndpointManager
.
Send
(
$"RENDERER*
{
layer
}
*STAGE START"
);
conn
.
EndpointManager
.
Send
(
$"RENDERER*
{
layer
}
*STAGE START"
);
}
}
else
{
conn
.
EndpointManager
.
Send
(
$"SCENE*
{
scene
}
*STAGE START"
);
}
}
/// <summary>
/// <summary>
/// 继续版子
/// 继续版子
...
...
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