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
4 changes: 2 additions & 2 deletions Assets/_Project/Art/Sprites/Phone/player_bubble.png.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/UI/ApartmentOnboarding/garden.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/UI/ApartmentOnboarding/garden.png.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/WorldMap/UI/garden_week/clock.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/WorldMap/UI/garden_week/clock.png.meta

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

4 changes: 2 additions & 2 deletions Assets/_Project/Art/WorldMap/UI/growth/bud.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ MonoBehaviour:
_instanceId: d06badb4d8954c1cbd8217c55ffb27a2
_definition: {fileID: 11400000, guid: 63e96c1732df4e74daa06a8bcce873f4, type: 2}
_anchor: {fileID: 948868639261107561}
_isSceneFurniture: 0
_sortingAnchor: {fileID: 0}
_sortingOrderOffset: 0
_useDynamicSortingRule: 0
--- !u!114 &948868639261107561
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
4 changes: 2 additions & 2 deletions Assets/_Project/Prefabs/UI/Bubble_Angel.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "今天也请保持好心情哦~我一直都在呢,有什么想聊的?🌸"
m_text: "\u4ECA\u5929\u4E5F\u8BF7\u4FDD\u6301\u597D\u5FC3\u60C5\u54E6\uFF5E\u6211\u4E00\u76F4\u90FD\u5728\u5462\uFF0C\u6709\u4EC0\u4E48\u60F3\u804A\u7684\uFF1F\U0001F338"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
Expand All @@ -292,7 +292,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 20
m_fontSize: 19.75
m_fontSizeBase: 20
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down
16 changes: 8 additions & 8 deletions Assets/_Project/Prefabs/UI/Bubble_Devil.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1799701954867629120}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -22.2061, y: 0}
m_SizeDelta: {x: -44.4122, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7212316972579228894
CanvasRenderer:
Expand Down Expand Up @@ -140,7 +140,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "啧,又来找我了?行吧,今天就勉为其难陪你聊聊。直接说吧,别拐弯抹角的。"
m_text: "\u5567\uFF0C\u53C8\u6765\u627E\u6211\u4E86\uFF1F\u884C\u5427\uFF0C\u4ECA\u5929\u5C31\u52C9\u4E3A\u5176\u96BE\u966A\u4F60\u804A\u804A\u3002\u76F4\u63A5\u8BF4\u5427\uFF0C\u522B\u62D0\u5F2F\u62B9\u89D2\u7684\u3002"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
Expand Down Expand Up @@ -170,7 +170,7 @@ MonoBehaviour:
m_fontSize: 20
m_fontSizeBase: 20
m_fontWeight: 400
m_enableAutoSizing: 1
m_enableAutoSizing: 0
m_fontSizeMin: 16
m_fontSizeMax: 28
m_fontStyle: 0
Expand Down Expand Up @@ -350,8 +350,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 66.87421, y: -0}
m_SizeDelta: {x: 394.9737, y: 0}
m_AnchoredPosition: {x: 66.87421, y: -69}
m_SizeDelta: {x: 400, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!222 &1382900177920987703
CanvasRenderer:
Expand Down
Loading
Loading