Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
0915a92
feat(petstatus): add Mood/Relation fill bars and wire to ProfilePanel…
ULookup May 31, 2026
c9319b6
Merge origin/main (PR #16: 恶魔动画资源) into merge/pr-14-devil-anim-space-sys
ULookup May 31, 2026
61ee314
fix: restore Apartment_Main.unity from origin/main (PR #16 scene)
ULookup May 31, 2026
176770d
fix: add Pet_Devil to Pet parent children list (YAML corruption from …
ULookup May 31, 2026
d384725
fix: restore working Apartment_Main scene from before merge
ULookup May 31, 2026
a801bf8
fix: add YAML header and Pet_Devil children fix to PR #16 scene
ULookup May 31, 2026
cc82943
docs: add collection gacha system design spec (2026-05-31)
ULookup May 31, 2026
1dcc62c
feat(collection): implement collection gacha system with coin economy
ULookup May 31, 2026
adb536d
fix(collection): rebuild Panel_Collection UI layout in Apartment_Main…
ULookup May 31, 2026
287edcb
fix(collection): swap CollectionPanelStub to GachaPanelController, ad…
ULookup May 31, 2026
3fd9af5
fix(phone): move CanvasGroup from PhoneChatRoot to PhoneFrame, fix co…
ULookup May 31, 2026
a137ff2
fix(phone): make ScreenArea Image transparent to avoid covering Phone…
ULookup May 31, 2026
424b890
feat(chat): add LLM-driven stat changes for pet chat replies
ULookup May 31, 2026
e0cafeb
fix: wire GachaPanelController._content to hide Collection panel by d…
ULookup May 31, 2026
26b7b5f
fix: move InputArea into PhoneFrame, wire CollapsedButton and Profile…
ULookup May 31, 2026
ed6f010
fix: set initial fillAmount on status bars to match default pet data
ULookup May 31, 2026
0b1cdd1
fix: set status bar Image type to Filled/Horizontal so fillAmount works
ULookup May 31, 2026
e861949
fix: slow down stat tick speeds, assign personality SOs, fix phone bu…
ULookup May 31, 2026
7e9eb3f
fix: phone chat — LLM config, bubble layout, input RTL, code review f…
ULookup May 31, 2026
bee2d42
feat: wire GachaPanelController to Collection panel with coin display
ULookup May 31, 2026
2905de2
fix: set LXGWWenKai as universal fallback font for all TMP font assets
ULookup May 31, 2026
2efb81d
Add gacha machine animation logic
kaki-1223 Jun 1, 2026
6cc7ff8
Merge pull request #19 from kaki-1223/feature/gacha-machine
ULookup Jun 1, 2026
8f63bfc
feat: add gacha animation delay, SpaceSys pet bars, default PetStatus…
ULookup Jun 1, 2026
d102432
Merge pull request #20 from ULookup/feature/ui-polish-font
ULookup Jun 1, 2026
4475e3a
合并 upstream/dev:UI系统更新 + 保留本地桌宠/家具/动画
habhab783124-lab Jun 1, 2026
cbe3279
场景UI对齐dev:移除Panel_Garden/Panel_Inventory,保留StatusPanel
habhab783124-lab Jun 1, 2026
eb5cfc2
修复:PetRuntimeData 添加 Relation 字段以支持 dev 的 ProfilePanelStub
habhab783124-lab Jun 1, 2026
3212445
修复:同步 PetRuntimeSnapshotChangedEvent 和 PetController 的 Relation 参数
habhab783124-lab Jun 1, 2026
1021e2f
清理:移除本地残留的 Btn_Garden/Btn_Inventory/Tabs 孤立UI对象
habhab783124-lab Jun 1, 2026
91831bb
修复:回退 TMP 字体文件到本地版本,消除字体 Atlas 贴图缺失报错
habhab783124-lab Jun 1, 2026
d04e717
移除每日抽签页面的 PastPlaceholder/PresentPlaceholder/FuturePlaceholder/Summar…
habhab783124-lab Jun 1, 2026
3527125
还原:恢复 Panel_Tarot 的四个 Placeholder 占位对象
habhab783124-lab Jun 1, 2026
da13db8
修复:完全替换5个侧栏面板为dev版本,消除本地旧文档叠加
habhab783124-lab Jun 1, 2026
cb2f34b
修复:恢复 dev 字体系统以支持中文显示(TMP Settings + LXGWWenKai fallback)
habhab783124-lab Jun 1, 2026
e2ed09c
首次打包版本:合并 UI 字体系统 + 塔罗 LLM 空内容回退修复 + 桌宠/家具/动画保留
habhab783124-lab Jun 1, 2026
b5df442
第一次合并版本
habhab783124-lab Jun 2, 2026
0ed39a9
修复:从 upstream/dev 恢复 PhoneChatRoot 聊天框 UI 到 Apartment 场景
habhab783124-lab Jun 2, 2026
6e4c4c5
修复:UI 排版调整、Scene 预览、隔离工具、PhoneChat 按钮修复
habhab783124-lab Jun 11, 2026
ece7b87
侧边面板button UI替换
kaki-1223 Jun 11, 2026
441a4cc
替换一部分UI素材
kaki-1223 Jun 11, 2026
d047450
修正空间系统部分资源
kaki-1223 Jun 24, 2026
7035036
修复收藏系统reward_window显示问题
kaki-1223 Jun 24, 2026
0e8ba2c
安装spine插件
kaki-1223 Jun 25, 2026
53a2544
桌宠动画资源上传
kaki-1223 Jun 25, 2026
fdf408f
安装插件:UniWindowController
kaki-1223 Jun 25, 2026
039999e
实现桌面出现 背景透明功能
kaki-1223 Jun 25, 2026
b0ac164
实现桌面可拖动桌宠功能
kaki-1223 Jun 26, 2026
ee46842
feat: 添加 7 个开发调试工具
habhab783124-lab Jul 3, 2026
0454b08
Merge branch '工具开发' into 修复部分bug: 合入 7 个开发调试工具
habhab783124-lab Jul 3, 2026
a99f4b9
fix: 抽签 UI 调整 + 清理废弃资产 + 调试开关 + 中文标签 + 正逆位随机
habhab783124-lab Jul 8, 2026
fc557f3
@
habhab783124-lab Jul 12, 2026
3fcadea
已修复大部分bug
habhab783124-lab Jul 13, 2026
c53cd4e
feat: 初步实现情绪种植流程
habhab783124-lab Jul 19, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 8 additions & 0 deletions Assets/Editor.meta

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

32 changes: 32 additions & 0 deletions Assets/Editor/SpineSettings.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b29e98153ec2fbd44b8f7da1b41194e8, type: 3}
m_Name: SpineSettings
m_EditorClassIdentifier:
defaultScale: 0.01
defaultMix: 0.2
defaultShader: Spine/Skeleton
defaultZSpacing: 0
defaultInstantiateLoop: 1
showHierarchyIcons: 1
setTextureImporterSettings: 1
textureSettingsReference:
blendModeMaterialMultiply: {fileID: 0}
blendModeMaterialScreen: {fileID: 0}
blendModeMaterialAdditive: {fileID: 0}
atlasTxtImportWarning: 1
textureImporterWarning: 1
componentMaterialWarning: 1
autoReloadSceneSkeletons: 1
handleScale: 1
mecanimEventIncludeFolderName: 1
timelineUseBlendDuration: 1
8 changes: 8 additions & 0 deletions Assets/Editor/SpineSettings.asset.meta

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

5 changes: 5 additions & 0 deletions Assets/Spine Examples.meta

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

9 changes: 9 additions & 0 deletions Assets/Spine Examples/Getting Started.meta

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

Loading
Loading