From 55584401625bd33c00dd49edeb11184002296050 Mon Sep 17 00:00:00 2001
From: BlueRose <378100977@qq.com>
Date: Tue, 7 May 2024 15:45:07 +0800
Subject: [PATCH] vault backup: 2024-05-07 15:45:07

---
 .../plugins/various-complements/histories.json      |  2 +-
 .../VPS服务部署/Perforce Helix Core搭建.md          | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.obsidian/plugins/various-complements/histories.json b/.obsidian/plugins/various-complements/histories.json
index cff3daa..8cdb717 100644
--- a/.obsidian/plugins/various-complements/histories.json
+++ b/.obsidian/plugins/various-complements/histories.json
@@ -1 +1 @@
-{"128044539":{"128044539":{"currentFile":{"count":1,"lastUpdated":1714359212233}}},"渲染机器渲染":{"渲染机器渲染":{"currentFile":{"count":1,"lastUpdated":1712559691350}}},"imgPath":{"imgPath":{"currentFile":{"count":1,"lastUpdated":1713156550242}}},"03-UnrealEngine":{"03-UnrealEngine":{"internalLink":{"count":1,"lastUpdated":1713156577045}}},"StartLiveDirector：启动Bat文件":{"StartLiveDirector：启动Bat文件":{"currentFile":{"count":1,"lastUpdated":1713845438773}}},"Tools：一些第三方库，以及":{"Tools：一些第三方库，以及":{"currentFile":{"count":1,"lastUpdated":1713845507638}}},"LiveDirector：导播台。":{"LiveDirector：导播台。":{"currentFile":{"count":1,"lastUpdated":1713846588874}}},"Python：小工具，":{"Python：小工具，":{"currentFile":{"count":1,"lastUpdated":1713847220779}}},"HotKeyManager：快捷键相关，可以通过配置实现。":{"HotKeyManager：快捷键相关，可以通过配置实现。":{"currentFile":{"count":1,"lastUpdated":1713948483286}}},"MotionProcessor：导播台，动捕":{"MotionProcessor：导播台，动捕":{"currentFile":{"count":1,"lastUpdated":1714027644634}}},"启动青瞳客户端。右下一。":{"启动青瞳客户端。右下一。":{"currentFile":{"count":1,"lastUpdated":1714027880674}}},"MapEnvironment.Bat修改Server":{"MapEnvironment.Bat修改Server":{"currentFile":{"count":1,"lastUpdated":1714028106908}}},"StreamDock":{"StreamDock":{"currentFile":{"count":1,"lastUpdated":1714033564310}}},"添加道具、物品、场景、特效":{"添加道具、物品、场景、特效":{"currentFile":{"count":1,"lastUpdated":1714036023017}}},"Depot":{"Depot":{"currentFile":{"count":1,"lastUpdated":1715056129878}}}}
\ No newline at end of file
+{"128044539":{"128044539":{"currentFile":{"count":1,"lastUpdated":1714359212233}}},"渲染机器渲染":{"渲染机器渲染":{"currentFile":{"count":1,"lastUpdated":1712559691350}}},"imgPath":{"imgPath":{"currentFile":{"count":1,"lastUpdated":1713156550242}}},"03-UnrealEngine":{"03-UnrealEngine":{"internalLink":{"count":1,"lastUpdated":1713156577045}}},"StartLiveDirector：启动Bat文件":{"StartLiveDirector：启动Bat文件":{"currentFile":{"count":1,"lastUpdated":1713845438773}}},"Tools：一些第三方库，以及":{"Tools：一些第三方库，以及":{"currentFile":{"count":1,"lastUpdated":1713845507638}}},"LiveDirector：导播台。":{"LiveDirector：导播台。":{"currentFile":{"count":1,"lastUpdated":1713846588874}}},"Python：小工具，":{"Python：小工具，":{"currentFile":{"count":1,"lastUpdated":1713847220779}}},"HotKeyManager：快捷键相关，可以通过配置实现。":{"HotKeyManager：快捷键相关，可以通过配置实现。":{"currentFile":{"count":1,"lastUpdated":1713948483286}}},"MotionProcessor：导播台，动捕":{"MotionProcessor：导播台，动捕":{"currentFile":{"count":1,"lastUpdated":1714027644634}}},"启动青瞳客户端。右下一。":{"启动青瞳客户端。右下一。":{"currentFile":{"count":1,"lastUpdated":1714027880674}}},"MapEnvironment.Bat修改Server":{"MapEnvironment.Bat修改Server":{"currentFile":{"count":1,"lastUpdated":1714028106908}}},"StreamDock":{"StreamDock":{"currentFile":{"count":1,"lastUpdated":1714033564310}}},"添加道具、物品、场景、特效":{"添加道具、物品、场景、特效":{"currentFile":{"count":1,"lastUpdated":1714036023017}}},"Depot":{"Depot":{"currentFile":{"count":1,"lastUpdated":1715056129878}}},"shiwanpico":{"shiwanpico":{"currentFile":{"count":1,"lastUpdated":1715065937496}}}}
\ No newline at end of file
diff --git a/03-UnrealEngine/流程管理与部署/VPS服务部署/Perforce Helix Core搭建.md b/03-UnrealEngine/流程管理与部署/VPS服务部署/Perforce Helix Core搭建.md
index 30b1add..13a50de 100644
--- a/03-UnrealEngine/流程管理与部署/VPS服务部署/Perforce Helix Core搭建.md	
+++ b/03-UnrealEngine/流程管理与部署/VPS服务部署/Perforce Helix Core搭建.md	
@@ -441,6 +441,13 @@ Samples\**\Saved\*
 2. Artsource（Local Depot）
 	1. 美术资产。
 
-分支：
-1. 开发分支
-2. 稳定分支
+## 分支
+1. UE4
+2. UE5
+3. Trunk分支（主干）
+4. shiwan（线上分支）
+	1. shiwanxxx
+	2. shiwanpico 
+	3. ...
+
+使用最暴力的mainland（主干）分支开发模式，如有试玩需求，会创建shiwan分支。
\ No newline at end of file