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
8 changes: 8 additions & 0 deletions Assets/_Project/Art/icon.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/_Project/Art/icon/icon (2).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
114 changes: 114 additions & 0 deletions Assets/_Project/Art/icon/icon (2).png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/_Project/Scenes/Apartment/Apartment_Main.unity
Original file line number Diff line number Diff line change
Expand Up @@ -41144,7 +41144,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -235.3, y: 130.73}
m_SizeDelta: {x: 1920, y: 1081.1}
m_SizeDelta: {x: 1960, y: 1081.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1237065748
MonoBehaviour:
Expand Down
6 changes: 3 additions & 3 deletions Assets/_Project/Scenes/Intro/Prologue.unity
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ MonoBehaviour:
textAlignment: 513
textColor: {r: 0.09803922, g: 0.050980393, b: 0.02745098, a: 1}
- video: {fileID: 32900000, guid: 8978bee36817fd047a0a2d104b9dae8b, type: 3}
text: "\t\u4E00\u53EA\u7FBD\u7FFC\u91D1\u84DD\u7684\u8774\u8776\u6816\u606F\u4E8E\u751F\u547D\u6811\u7684\u6811\u679D\uFF0C\u5B9B\u5982\u5149\u4E0B\u788E\u73E0\uFF0C\r\n\t\u5B83\u5782\u9996\u77A5\u89C1\u719F\u900F\u7684\u871C\u679C\u60AC\u4E8E\u679D\u5934\uFF0C\u7206\u6D46\u7684\u871C\u9732\u5982\u91D1\u8272\u7684\u743C\u6DB2\u7F13\u7F13\u6E17\u51FA"
text: "\t\u4E00\u53EA\u7FBD\u7FFC\u91D1\u84DD\u7684\u8774\u8776\u6816\u606F\u4E8E\u751F\u547D\u6811\u7684\u6811\u679D\uFF0C\u5B9B\u5982\u5149\u4E0B\u788E\u73E0\uFF0C\r\n\t\u5B83\u5782\u9996\u77A5\u89C1\u719F\u900F\u7684\u871C\u679C\u60AC\u4E8E\u679D\u5934\uFF0C\u7206\u6D46\u7684\u871C\u9732\u5982\u91D1\u8272\u7684\u743C\u6DB2\u7F13\u7F13\u6E17\u51FA\u3002"
illustration: {fileID: 0}
textOffset: {x: 456, y: -351}
textBoxSize: {x: 700, y: 200}
Expand All @@ -674,7 +674,7 @@ MonoBehaviour:
textAlignment: 513
textColor: {r: 0.09803922, g: 0.050980393, b: 0.02745098, a: 1}
- video: {fileID: 32900000, guid: 643de1b25bae92f499d348bf8d5f1a35, type: 3}
text: "\t\u540C\u65E5\u591C\u95F4\uFF0C\u6708\u82E5\u6D41\u94F6\uFF0C\u4E00\u53EA\u8424\u706B\u866B\u7A7F\u68AD\u4E8E\u667A\u6167\u6811\u7684\u679D\u53F6\uFF0C\r\n\u5C3E\u5C16\u6DE1\u7EA2\u8272\u7684\u5149\u70B9\u547C\u5438\u822C\u660E\u706D\r\n\t\u5B83\u6B47\u4E8E\u4E00\u7247\u53F6\uFF0C\u53F6\u4E0A\u6709\u4E00\u6EF4\u7425\u73C0\u8272\u7684\u679C\u6D46\uFF0C\u4E4D\u770B\u50CF\u4E00\u6EF4\u666E\u901A\u7684\u9732"
text: "\t\u540C\u65E5\u591C\u95F4\uFF0C\u6708\u82E5\u6D41\u94F6\uFF0C\u4E00\u53EA\u8424\u706B\u866B\u7A7F\u68AD\u4E8E\u667A\u6167\u6811\u7684\u679D\u53F6\uFF0C\r\n\u5C3E\u5C16\u6DE1\u7EA2\u8272\u7684\u5149\u70B9\u547C\u5438\u822C\u660E\u706D\r\n\t\u5B83\u6B47\u4E8E\u4E00\u7247\u53F6\uFF0C\u53F6\u4E0A\u6709\u4E00\u6EF4\u7425\u73C0\u8272\u7684\u679C\u6D46\uFF0C\u4E4D\u770B\u50CF\u4E00\u6EF4\u666E\u901A\u7684\u9732\u3002"
illustration: {fileID: 0}
textOffset: {x: 490, y: -332}
textBoxSize: {x: 700, y: 200}
Expand Down Expand Up @@ -737,7 +737,7 @@ MonoBehaviour:
textAlignment: 513
textColor: {r: 0.09803922, g: 0.050980393, b: 0.02745098, a: 1}
- video: {fileID: 32900000, guid: cb3d3f1515b1cd14190d8bd0e3684ce4, type: 3}
text: "\t\u6211\u4E0D\u77E5\u5B83\u4EEC\u662F\u4F55\u7269\uFF0C\u53EA\u83AB\u51A5\u89C9\u5F97\u4E0D\u8BE5\u7559\u4E8E\u90A3\u91CC\u4E8E\u662F\u6211\u627E\u4E86\u4E24\u53EA\u73BB\u7483\u74F6\u5C06\u5B83\u4EEC\u8F7B\u8F7B\u6536\u5165\uFF0C\u74F6\u53E3\u672A\u5C01\u4E00\u6211\u5411\u5B83\u4EEC\u4E5F\u9700\u8981\u7A97\u5916\u7684\u82B1\u9999\u548C\u98CE\u541F\u3002\n\t\u5B83\u4EEC\u5C31\u8FD9\u6837\u9759\u9759\u5730\uFF0C\u4E0D\u706D\uFF0C\u4E5F\u4E0D\u9192\u3002"
text: "\t\u6211\u4E0D\u77E5\u5B83\u4EEC\u662F\u4F55\u7269\uFF0C\u53EA\u83AB\u540D\u89C9\u5F97\u4E0D\u8BE5\u7559\u4E8E\u90A3\u91CC\u3002\u4E8E\u662F\u6211\u627E\u4E86\u4E24\u53EA\u73BB\u7483\u74F6\u5C06\u5B83\u4EEC\u8F7B\u8F7B\u6536\u5165\uFF0C\u74F6\u53E3\u672A\u5C01\u4E00\u6211\u60F3\u5B83\u4EEC\u4E5F\u9700\u8981\u7A97\u5916\u7684\u82B1\u9999\u548C\u98CE\u541F\u3002\n\t\u5B83\u4EEC\u5C31\u8FD9\u6837\u9759\u9759\u5730\uFF0C\u4E0D\u706D\uFF0C\u4E5F\u4E0D\u9192\u3002"
illustration: {fileID: 0}
textOffset: {x: -457, y: 73}
textBoxSize: {x: 700, y: 200}
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 @@ -19177,7 +19177,7 @@ RectTransform:
m_GameObject: {fileID: 166605679}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 341065922}
Expand Down Expand Up @@ -38184,7 +38184,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -30}
m_AnchoredPosition: {x: 59, y: 15}
m_SizeDelta: {x: 400, y: 260}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &316803993
Expand Down Expand Up @@ -169255,7 +169255,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &1425446057
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
10 changes: 5 additions & 5 deletions Assets/_Project/Scripts/Modules/RoomRelic/RoomRelicService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ namespace GeminiLab.Modules.RoomRelic
/// </summary>
public sealed class RoomRelicService : IRoomRelicService, IPersistentService, IDisposable
{
private const float NoteProbability = 0.5f;
private const float RelicProbability = 0.5f;
private const float GiftProbability = 0.15f;
private const float RelicUnlockFriendship = 45f;
private const float GiftUnlockFriendship = 80f;
private const float NoteProbability = 0.7f;
private const float RelicProbability = 0.6f;
private const float GiftProbability = 0.25f;
private const float RelicUnlockFriendship = 40f;
private const float GiftUnlockFriendship = 60f;

private readonly IGameClock _clock;
private readonly IPetSocialService _social;
Expand Down
44 changes: 43 additions & 1 deletion ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,49 @@ PlayerSettings:
AndroidMinifyDebug: 0
AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150
m_BuildTargetIcons: []
m_BuildTargetIcons:
- m_BuildTarget: Standalone
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: a56ee6ee737e5fa42adb79f97a2d58bb, type: 3}
m_Width: 1024
m_Height: 1024
m_Kind: 0
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 512
m_Height: 512
m_Kind: 0
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 256
m_Height: 256
m_Kind: 0
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 128
m_Height: 128
m_Kind: 0
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 64
m_Height: 64
m_Kind: 0
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 48
m_Height: 48
m_Kind: 0
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 32
m_Height: 32
m_Kind: 0
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 16
m_Height: 16
m_Kind: 0
m_BuildTargetPlatformIcons: []
m_BuildTargetBatching: []
m_BuildTargetShaderSettings: []
Expand Down
Loading