Skip to content

Commit 7c40a17

Browse files
committed
Fix private mode error when GP-02 is not installed
- Occurred when returning from DressCode editor, and private mode is enabled, but GP-02 is not installed.
1 parent 69ed48d commit 7c40a17

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/DressCode.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Version>1.4.0</Version>
4+
<Version>1.4.1</Version>
55
<Authors>Perdition</Authors>
66
<PackageProjectUrl>https://github.com/Perdition-117/COM3D2.DressCode</PackageProjectUrl>
77
<RepositoryUrl>https://github.com/Perdition-117/COM3D2.DressCode.git</RepositoryUrl>

src/DressCodeControl.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@ public void Init(DressCodeManager manager, CanvasComponent panel) {
7878
var dailyManager = manager.GetManager<DailyMgr>();
7979
dailyManager.m_goPanel.SetActive(true);
8080

81-
var privateMaid = PrivateModeMgr.Instance.PrivateMaid;
82-
if (privateMaid != null && !privateMaid.IsCrcBody) {
81+
var isPrivateMode = dailyManager.m_api.m_isPrivate;
82+
83+
if (isPrivateMode) {
84+
var privateMaid = PrivateModeMgr.Instance.PrivateMaid;
8385
privateMaid.Visible = true;
8486

8587
// update private maid costume if necessary
@@ -92,7 +94,7 @@ public void Init(DressCodeManager manager, CanvasComponent panel) {
9294
}
9395
}
9496
}
95-
manager.ResetBackground();
97+
manager.ResetBackground(isPrivateMode);
9698
GameMain.Instance.MainCamera.FadeIn();
9799
});
98100
};

src/DressCodeManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ internal void SetBackground() {
4242
GameMain.Instance.BgMgr.ChangeBg("Theater");
4343
}
4444

45-
internal void ResetBackground() {
45+
internal void ResetBackground(bool isPrivateMode) {
4646
if (GameMain.Instance.VRMode) {
4747
GameMain.Instance.MainCamera.SetTargetPos(new(0f, 1.327261f, -0.1473188f));
4848
GameMain.Instance.MainCamera.SetDistance(3.6f);
@@ -53,7 +53,7 @@ internal void ResetBackground() {
5353
GameMain.Instance.MainCamera.SetAroundAngle(new(245.5691f, 6.273283f));
5454
}
5555
//GameMain.Instance.MainCamera.SetTargetOffset(Vector3.zero, false);
56-
if (PrivateModeMgr.Instance.PrivateMaid != null) {
56+
if (isPrivateMode) {
5757
PrivateModeMgr.Instance.SelectBG.Apply(GameMain.Instance.CharacterMgr.status.isDaytime);
5858
GameMain.Instance.ScriptMgr.is_motion_blend = false;
5959
PrivateModeMgr.Instance.SelectLocation.LoadScript();

0 commit comments

Comments
 (0)