Commit Graph

175 Commits

Author SHA1 Message Date
wuxiangwanzi a215852381 Merge remote-tracking branch 'origin/master' into codex/tiaoyitiao 2026-06-05 22:46:57 +08:00
kdletters d489488ca2 fix: 稳定推荐页拼图下一关体验 2026-06-05 16:19:35 +08:00
kdletters fdafe8d747 fix: allow masked phone author display 2026-06-05 00:51:43 +08:00
wuxiangwanzi c442c3c3f0 Merge remote-tracking branch 'origin/codex/tiaoyitiao' into codex/tiaoyitiao
# Conflicts:
#	docs/prd/【玩法创作】跳一跳俯视角玩法模板PRD-2026-05-19.md
#	server-rs/crates/spacetime-client/src/jump_hop.rs
#	server-rs/crates/spacetime-client/src/mapper/runtime.rs
#	server-rs/crates/spacetime-client/src/wooden_fish.rs
#	src/components/jump-hop-result/JumpHopResultView.test.tsx
#	src/components/jump-hop-runtime/JumpHopRuntimeShell.test.tsx
#	src/components/platform-entry/PlatformEntryFlowShellImpl.tsx
#	src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx
#	src/components/unified-creation/workspaces/JumpHopCreationWorkspace.tsx
#	src/components/unified-creation/workspaces/JumpHopWorkspace.test.tsx
2026-06-04 11:34:31 +08:00
wuxiangwanzi 7d2d67a3f5 feat(jump-hop): redesign sling platform gameplay 2026-06-03 22:21:00 +08:00
kdletters deadce9cf1 fix: 收窄创作入口关闭熔断范围 2026-06-03 20:46:08 +08:00
kdletters 01a68bcf3d fix: route creation wallet chip to top-up entry 2026-06-03 20:46:08 +08:00
kdletters 545ffa4b2c fix: hide public card account identifiers 2026-06-03 12:09:03 +08:00
kdletters 3f742fbaca feat: unify creation entry templates 2026-06-03 10:29:44 +08:00
kdletters b0865cfa19 Merge branch 'codex/feature-1'
# Conflicts:
#	docs/【玩法创作】平台入口与玩法链路-2026-05-15.md
#	src/components/platform-entry/PlatformEntryFlowShellImpl.tsx
#	src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx
#	src/services/miniGameDraftGenerationProgress.ts
2026-06-03 03:56:25 +08:00
kdletters 70ff18ad90 feat: 支持创作入口公告配置 2026-06-03 03:31:45 +08:00
kdletters 67ba40c678 Refine play type integration flow and docs 2026-06-03 01:25:53 +08:00
kdletters 2fdeb34567 fix: lock recharge flow until virtual payment settles 2026-06-02 01:47:54 +08:00
kdletters 1cb11bc1dd fix: refine profile shortcuts and puzzle next button 2026-06-01 16:45:46 +00:00
kdletters 3ffa9e0bb1 Merge remote-tracking branch 'origin/codex/unified-creation-flow-phase1'
# Conflicts:
#	server-rs/crates/api-server/src/wooden_fish.rs
2026-06-01 15:22:58 +08:00
kdletters 23dec91bd6 收口统一创作流程一期 2026-05-31 14:46:32 +00:00
kdletters c193a352df 收口创作流程统一总计划并修复等待页窄屏裁切 2026-05-31 05:57:34 +00:00
kdletters 78448d2a7b merge master into codex/wechat-mini-program-virtual-payment 2026-05-30 16:46:11 +08:00
kdletters aaaba77c3a fix wechat virtual payment coin flow 2026-05-30 16:42:25 +08:00
kdletters ca2a4c0295 不同时显示玩家名称和陶泥号 2026-05-28 21:28:28 +08:00
kdletters 1a56bb1e8a refactor auth payloads to slim snapshots 2026-05-28 20:46:21 +08:00
kdletters d2f838582f fix public author display 2026-05-28 20:45:27 +08:00
kdletters 31afb2b18a fix public work author display 2026-05-28 17:47:31 +08:00
kdletters 2cd2b9704b fix puzzle generation failure stage 2026-05-28 15:13:20 +08:00
kdletters c8b36cf799 fix wooden fish author and title display 2026-05-28 14:31:13 +08:00
kdletters 9c6fa10301 fix wechat mini program virtual payment flow 2026-05-28 00:41:06 +08:00
kdletters b43c3cd823 Merge remote-tracking branch 'origin/master' into codex/wechat-mini-program-virtual-payment
# Conflicts:
#	.hermes/shared-memory/decision-log.md
2026-05-27 20:35:32 +08:00
kdletters 46f8a1e613 fix: allow guest recommend swipe 2026-05-27 04:25:09 +08:00
kdletters 2411eb6513 fix: remove fixed match3d demo 2026-05-27 00:57:28 +08:00
kdletters f36b90ebdb feat: switch mini program recharge to virtual payment 2026-05-26 22:32:16 +08:00
kdletters 54683cb3ac Merge branch 'master' into codex/frontend-error-dialogs
# Conflicts:
#	.hermes/shared-memory/decision-log.md
#	server-rs/crates/api-server/src/generated_asset_sheets.rs
2026-05-26 22:10:41 +08:00
kdletters 17a184b0a7 fix: settle puzzle failures and profile tasks 2026-05-26 22:02:58 +08:00
kdletters 4001ee0a5c Add platform generation dialogs and task refresh 2026-05-26 19:40:23 +08:00
kdletters 564fc01b37 test: align puzzle next-level expectation 2026-05-26 16:52:22 +08:00
kdletters 5fb51f4430 Merge remote-tracking branch 'origin/master' into codex/fix-draft-result-back-target 2026-05-26 16:45:57 +08:00
kdletters 4e14301b33 Merge remote-tracking branch 'origin/master' into codex/fix-draft-result-back-target
# Conflicts:
#	src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx
2026-05-26 16:43:30 +08:00
kdletters d50e69560b Merge remote-tracking branch 'origin/master' into codex/public-work-readmodel-smooth-transition 2026-05-26 16:38:38 +08:00
kdletters aeee782fe0 Add public work read model and smooth puzzle transitions 2026-05-26 16:38:27 +08:00
kdletters abea7cec1d feat: 平台错误与完成弹窗收口 2026-05-26 15:57:39 +08:00
kdletters 2a031bcd89 fix: return draft results to shelf 2026-05-26 14:43:49 +08:00
kdletters fbda614156 feat: surface platform errors in copyable dialogs 2026-05-26 14:27:18 +08:00
wuxiangwanzi 288215285e Merge remote-tracking branch 'origin/master' into codex/wooden-fish-template
# Conflicts:
#	.hermes/shared-memory/decision-log.md
#	.hermes/shared-memory/pitfalls.md
#	docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md
#	src/components/platform-entry/PlatformEntryFlowShellImpl.tsx
2026-05-26 02:00:11 +08:00
wuxiangwanzi f79a6ea81e fix: stabilize match3d demo discovery 2026-05-26 00:13:08 +08:00
JenkenB e0655db01e Merge branch 'master' of https://git.genarrative.world/GenarrativeAI/Genarrative 2026-05-25 23:09:16 +08:00
JenkenB 19319df426 Merge branch 'master' of https://git.genarrative.world/GenarrativeAI/Genarrative 2026-05-25 23:09:07 +08:00
JenkenB 5a6e68b6dc 1 2026-05-25 22:57:14 +08:00
kdletters 4b8e7cf4a5 merge: sync origin master into puzzle runtime restore 2026-05-25 22:57:07 +08:00
kdletters eb6ab404e2 fix: restore puzzle runtime url state 2026-05-25 22:52:38 +08:00
kdletters 62a24bf0e5 fix: keep recommend runtime on local auth 2026-05-25 22:45:29 +08:00
kdletters 21d95a18d3 Merge remote-tracking branch 'origin/master' into codex/recommendation-login-modal-fix
# Conflicts:
#	src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx
#	src/components/rpg-entry/RpgEntryHomeView.recharge.test.tsx
2026-05-25 22:01:03 +08:00