Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions Assets/_Project/Art/WorldMap/UI输入框去字/wish_input.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 16 additions & 30 deletions Assets/_Project/Scenes/Apartment/Apartment_Main.unity
Original file line number Diff line number Diff line change
Expand Up @@ -11185,8 +11185,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281020725
m_fontColor: {r: 0.20784314, g: 0.19215687, b: 0.16862746, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
Expand Down Expand Up @@ -15378,8 +15378,8 @@ MonoBehaviour:
- {fileID: 0}
m_fontColor32:
serializedVersion: 2
rgba: 4281020725
m_fontColor: {r: 0.20754719, g: 0.19185984, b: 0.16904, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
Expand Down Expand Up @@ -22729,8 +22729,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281020725
m_fontColor: {r: 0.20784314, g: 0.19215687, b: 0.16862746, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
Expand Down Expand Up @@ -23127,7 +23127,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 182.8, y: 125}
m_AnchoredPosition: {x: 182.8, y: 189}
m_SizeDelta: {x: -485.60498, y: 88}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &689000875
Expand Down Expand Up @@ -49799,7 +49799,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1475339755
RectTransform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -50088,7 +50088,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 182.8, y: 366}
m_AnchoredPosition: {x: 182.8, y: 417}
m_SizeDelta: {x: -485.605, y: 88}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1485019533
Expand Down Expand Up @@ -59922,7 +59922,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1707805764
RectTransform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -75735,8 +75735,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
Expand Down Expand Up @@ -76031,8 +76031,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
Expand Down Expand Up @@ -76327,8 +76327,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
Expand Down Expand Up @@ -76420,7 +76420,6 @@ GameObject:
- component: {fileID: 2199001005}
- component: {fileID: 2199001004}
- component: {fileID: 2199001003}
- component: {fileID: 2199001006}
m_Layer: 5
m_Name: ApartmentViewportHost
m_TagString: Untagged
Expand Down Expand Up @@ -76511,19 +76510,6 @@ MonoBehaviour:
- {fileID: 1336465395}
_furnitureHover: {fileID: 1741491749}
_buildMode: {fileID: 0}
--- !u!114 &2199001006
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2199001001}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cc516cf6c3ec4d347897937b77927df5, type: 3}
m_Name:
m_EditorClassIdentifier:
_description: "\u6BCF\u665A\u8EBA\u4E0B\uFF0C\u5C31\u50CF\u7761\u8FDB\u4E00\u7247\u67D4\u8F6F\u7684\u6708\u5149\u91CC"
--- !u!1 &2199001011
GameObject:
m_ObjectHideFlags: 0
Expand Down
6 changes: 3 additions & 3 deletions Assets/_Project/Scenes/WorldMap/WorldMap_Main.unity
Original file line number Diff line number Diff line change
Expand Up @@ -50438,7 +50438,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 13f0fae6998b9ee4fa2bc2ea69bf58e7, type: 3}
m_Sprite: {fileID: 21300000, guid: cf166e61cf0c1fd448e4af6d9e2934a6, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
Expand Down Expand Up @@ -169255,7 +169255,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &1425446057
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -175199,7 +175199,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1479303920
RectTransform:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ public static void ExitOverlay()
int previousWidth =
PlayerPrefs.GetInt(
PreviousWidthKey,
1280
1920
);

int previousHeight =
PlayerPrefs.GetInt(
PreviousHeightKey,
720
1080
);

// Desktop_Overlay 还没被卸载时
Expand Down Expand Up @@ -109,7 +109,7 @@ private static void RestoreNormalWindow()
// 把 UniWindowController 控制的原生窗口
// 明确缩回主程序尺寸
window.windowSize =
new Vector2(1280f, 720f);
new Vector2(1920f, 1080f);
}

#endif
Expand All @@ -118,8 +118,8 @@ private static void RestoreNormalWindow()
FullScreenMode.Windowed;

Screen.SetResolution(
1280,
720,
1920,
1080,
FullScreenMode.Windowed
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ namespace GeminiLab.Modules.EmotionGarden
public static class EmotionGardenGrowthTiming
{
// 10分钟发芽
public const float SproutSeconds = 10f*60f;
public const float SproutSeconds = 10f;

// 60分钟成熟
public const float BloomSeconds = 60f*60f;
public const float BloomSeconds = 60f;

public static TimeSpan BloomDuration =>
TimeSpan.FromSeconds(BloomSeconds);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private void Update()
if (Input.GetKeyDown(KeyCode.Escape)) DeclineConversation();
AdvanceDialogue(Time.unscaledTime);
if (_hint == null) return;
_hint.text = _dialogueActive ? "Esc 结束交流" : _choiceVisible ? "" : _closeBlocked ? "门口有宠物,走开后再关门" : !_isOpen ? "点击小门开门" : _visitInitiator != null ? "F 再次显示交流选项" : "WASD 进入对方房间,可选择交流";
_hint.text = _dialogueActive ? "点击区域外结束交流" : _choiceVisible ? "" : _closeBlocked ? "门口有宠物,走开后再关门" : !_isOpen ? "点击小门开门" : _visitInitiator != null ? "F 再次显示交流选项" : "WASD 进入对方房间,可选择交流";
}

private bool CanOfferConversation()
Expand Down
8 changes: 0 additions & 8 deletions Assets/packages-merged-link.meta

This file was deleted.

30 changes: 0 additions & 30 deletions Assets/packages-merged-link/link.xml

This file was deleted.

7 changes: 0 additions & 7 deletions Assets/packages-merged-link/link.xml.meta

This file was deleted.

4 changes: 2 additions & 2 deletions ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ PlayerSettings:
m_SplashScreenLogos: []
m_VirtualRealitySplashScreen: {fileID: 0}
m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1280
defaultScreenHeight: 720
defaultScreenWidth: 1920
defaultScreenHeight: 1080
defaultScreenWidthWeb: 960
defaultScreenHeightWeb: 600
m_StereoRenderingPath: 0
Expand Down
Loading