xionglijia/18xchat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
268 Commits 2 Branches 0 Tags
9aafecdd39b4d0e6e4b5868557823895a6f14ae7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
xionglijia 7687a4f026 update 2025-09-17 16:46:31 +08:00
xionglijia a6d3fa6db0 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-17 16:29:00 +08:00
xionglijia d39f7922e8 fix 2025-09-17 16:28:55 +08:00
xionglijia be1389df98 update 2025-09-17 16:12:54 +08:00
xionglijia 586ea3848d update 聊天体验，角色10001prompt， 基础prompt 2025-09-16 19:25:02 +08:00
xionglijia 3b52d90ad1 update 2025-09-16 19:23:12 +08:00
xionglijia d7dcd00b6e update 2025-09-16 19:14:21 +08:00
xionglijia 4e00f2a382 update chat exp 2025-09-16 19:03:00 +08:00
xionglijia 141c6a5909 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-16 16:55:43 +08:00
xionglijia 9a3525afd3 优化聊天部分 2025-09-16 16:55:39 +08:00
xionglijia 76bd04b9f4 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-16 11:58:20 +08:00
xionglijia aa5b95f833 个人信息页入版 2025-09-16 11:58:15 +08:00
xionglijia 5a5014b024 update 2025-09-15 16:11:15 +08:00
xionglijia eb0163b3fc Merge branch 'dev_layout' 2025-09-15 11:57:38 +08:00
xionglijia e3c77d354e Squashed commit of the following: 
commit 8d3548006d
Author: chen wei bo <1025839511@qq.com>
Date:   Fri Sep 12 16:00:29 2025 +0800

    更新语言表

commit 0d66f72c61
Author: chen wei bo <1025839511@qq.com>
Date:   Fri Sep 12 15:19:32 2025 +0800

    支付相关

commit 8372d3b489
Author: chen wei bo <1025839511@qq.com>
Date:   Fri Sep 12 11:29:11 2025 +0800

    登录之后获取全局数据
 2025-09-15 11:57:21 +08:00
xionglijia cdfb9b2b17 imageItem 缓存池 2025-09-15 11:55:22 +08:00
xionglijia bef2efc7e3 GirlList缓存池 2025-09-15 11:46:55 +08:00
xionglijia 413ac5ccf6 update 2025-09-15 11:29:23 +08:00
xionglijia 0e86ba3454 调整布局、新增导航栏，调整页面跳转逻辑 2025-09-12 18:20:41 +08:00
xionglijia c11a310ea1 update 2025-09-11 19:44:24 +08:00
xionglijia e1b83dde56 update 2025-09-11 19:30:31 +08:00
xionglijia 5cc13a00cd fix 2025-09-11 18:51:35 +08:00
xionglijia 49f4d21c56 update 音效 - 主题图 2025-09-11 18:49:27 +08:00
xionglijia 0f9690b0e1 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-11 17:07:35 +08:00
xionglijia 6bf85c6ad8 头像入版 页面跳转优化 2025-09-11 17:07:29 +08:00
xionglijia d6a9898c8d 优化加载显示 2025-09-11 15:01:03 +08:00
xionglijia 7ed18b410d Merge branch 'main_fix' 
# Conflicts:
#	assets/Scripts/Sub/MainScene.ts
 2025-09-11 13:32:22 +08:00
xionglijia ae80fb250a fix 2025-09-11 13:29:08 +08:00
xionglijia 7156f85fdf update 2025-09-11 13:09:03 +08:00
xionglijia f3cfcecadf update 2025-09-11 12:31:10 +08:00
xionglijia 5accb0b507 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-11 10:54:10 +08:00
xionglijia a590433a91 update 2025-09-11 10:54:06 +08:00
xionglijia 53f2037c49 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-11 10:11:59 +08:00
xionglijia 7dedbf124c 设置页、弹窗逻辑、跳转逻辑 
视频播放逻辑优化
 2025-09-11 00:03:22 +08:00
xionglijia a6b15778a8 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-10 22:07:55 +08:00
xionglijia 8b6cdac9ab 删除过气资源 2025-09-10 22:07:47 +08:00
xionglijia 0333fcc0c0 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-10 21:49:59 +08:00
xionglijia 7aa0eb2a7c 1 2025-09-10 21:49:56 +08:00
xionglijia eb2e1857dc update 2025-09-10 21:49:39 +08:00
xionglijia 6a9e1ebe57 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-10 21:02:36 +08:00
xionglijia 3bdeb53859 设置页 2025-09-10 21:02:32 +08:00
xionglijia 24b9942110 聊天记录服务端+本地混合加载逻辑 2025-09-10 20:08:43 +08:00
xionglijia 1f832cb7d2 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-10 19:37:17 +08:00
xionglijia affd895346 设置页 2025-09-10 19:37:12 +08:00
xionglijia aa358d2e01 update 2025-09-10 18:38:20 +08:00
xionglijia 0cbb163740 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 
# Conflicts:
#	assets/Scripts/chat18x/ui/panels/ThemePanel.ts
 2025-09-10 18:13:39 +08:00
xionglijia 24c2a946a3 fix 
设置页面资源
 2025-09-10 18:12:26 +08:00
xionglijia cb2b8e76ea Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-10 16:43:58 +08:00
xionglijia 07bd9923fc fix chatmodel 2025-09-10 16:43:46 +08:00
xionglijia e4ee688dc8 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-10 15:48:35 +08:00
xionglijia 146c9a75a2 update 2025-09-10 15:48:27 +08:00
xionglijia 6b3176ed39 language fix 2025-09-10 14:24:52 +08:00
xionglijia ea0e3e1409 新增登录场景&修改登录逻辑位置 2025-09-10 12:29:05 +08:00
xionglijia 1ab16e896c Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-10 12:06:47 +08:00
xionglijia 8928bec2c2 fix 2025-09-10 12:06:34 +08:00
xionglijia eb55de718e update 大量更新资源 2025-09-09 23:19:28 +08:00
xionglijia e8ff82a475 fix 2025-09-09 22:05:26 +08:00
xionglijia 677b34ca15 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-09 21:32:14 +08:00
xionglijia 9dd18b6947 资源入版 2025-09-09 21:31:25 +08:00
xionglijia ffbced749c fix 2025-09-09 19:59:11 +08:00
xionglijia 7b6a119049 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 
# Conflicts:
#	assets/Scripts/chat18x/data/GirlData.ts
#	assets/Scripts/chat18x/uiitems/GirlListItem.ts
 2025-09-09 19:24:04 +08:00
xionglijia 90a986a79c update 2025-09-09 19:21:05 +08:00
xionglijia f9f2077665 fix 2025-09-09 16:09:10 +08:00
xionglijia 5e3e639638 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-09 15:45:54 +08:00
xionglijia c6b5def49a update 2025-09-09 15:45:50 +08:00
xionglijia 20e8e0b217 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-09 15:33:48 +08:00
xionglijia 46e04e2dc2 update 2025-09-09 15:33:44 +08:00
xionglijia 9077a19975 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 
# Conflicts:
#	assets/Scripts/Sub/UI/PreloadUI.ts
#	assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts
#	assets/Scripts/chat18x/uiitems/DetailImageItem.ts
 2025-09-09 14:50:51 +08:00
xionglijia da8ddc0716 新ui入版 2025-09-09 14:31:47 +08:00
xionglijia 1493f5b2ec Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 
# Conflicts:
#	assets/Scripts/schema/schema.ts
#	assets/bundles/DataTable/tbgirlsdetail.bin
 2025-09-08 14:18:07 +08:00
xionglijia a29e55f0ae ui资源 2025-09-08 14:17:29 +08:00
xionglijia 6ea12b7c77 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-05 15:16:43 +08:00
xionglijia b16339ef12 update 2025-09-05 15:16:25 +08:00
xionglijia c0e2bbdf34 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-04 17:29:22 +08:00
xionglijia b8bd43c15c update 2025-09-04 17:29:15 +08:00
xionglijia 88d14b6bc8 update 2025-09-02 17:08:13 +08:00
xionglijia 0c28ec7c01 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-02 17:07:49 +08:00
xionglijia c7166da056 update-prompt 2025-09-02 17:07:31 +08:00
xionglijia 61e0787c53 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-02 15:01:17 +08:00
xionglijia 82a5aa4598 update 2025-09-02 15:01:12 +08:00
xionglijia 6c0eb44d24 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-09-01 18:53:01 +08:00
xionglijia 8fb1f11862 update new video 2025-09-01 18:52:57 +08:00
xionglijia e2e542f6f1 update 2025-09-01 18:43:15 +08:00
xionglijia f46334c11a 1 2025-08-29 16:24:34 +08:00
xionglijia 3c254811f5 update_blur 2025-08-29 16:23:59 +08:00
xionglijia bf92949a43 fix 2025-08-29 16:10:04 +08:00
xionglijia db404c373c 生成缩略图 2025-08-29 15:44:27 +08:00
xionglijia 6a7ab27520 导入视频 2025-08-29 15:41:12 +08:00
xionglijia 76926b6db3 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-08-29 14:22:07 +08:00
xionglijia 56df0e1f86 更新技师资源 2025-08-29 14:21:46 +08:00
xionglijia 733a4806cf fix 2025-08-27 16:35:26 +08:00
xionglijia 2170c4a620 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-08-27 16:12:23 +08:00
xionglijia e57818d498 - MVP架构重构聊天逻辑 
- 优化聊天气泡体验
- 修复prompt bug
- 实现聊天次数限制功能（未接服务端）
- 实现情绪切视频功能
 2025-08-27 16:12:19 +08:00
xionglijia 9004f77e8d Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 
# Conflicts:
#	assets/Scripts/schema/schema.ts
#	assets/bundles/DataTable/tbaicharacters.bin
#	assets/bundles/DataTable/tbgirlsdetail.bin
#	assets/bundles/DataTable/tbglobalconfig.bin
 2025-08-26 19:41:54 +08:00
xionglijia 1507fff7c5 Chat相关表现&逻辑分离，新增ChatController 
新增情绪机器人逻辑，
新增情绪切换视频逻辑
 2025-08-26 19:41:13 +08:00
xionglijia 58bac34580 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-08-26 14:23:12 +08:00
xionglijia ff63a351e3 update 2025-08-26 14:23:02 +08:00
xionglijia cf334ea439 Merge branch 'main' of 47.107.44.202:xionglijia/18xchat 2025-08-25 20:15:56 +08:00
xionglijia d6c3c775b5 美术更新 
- detail页面修改
- ui布局修改
 2025-08-25 20:15:42 +08:00
xionglijia 2ae00f5c23 Merge branch 'main' of http://47.107.44.202:3000/xionglijia/18xchat 2025-08-25 13:01:53 +08:00