Commits · c0dd206dc6341cb5105d26682c5184e5692b2490 · pidan / FuSiLive

05 Mar, 2026 6 commits
- 初步洗完代码 · c0dd206d
  ludi committed Mar 05, 2026
  
  c0dd206d Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · 65b93064
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移

# Conflicts:
#	Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Controller/FUSLiveMainViewController.m
```
  ludi committed Mar 05, 2026
  65b93064 Browse Files
- 正在洗代码 · c42f244b
  ludi committed Mar 05, 2026
  
  c42f244b Browse Files
- no message · b519e4ed
  suolong committed Mar 05, 2026
  
  b519e4ed Browse Files
- 修复点bug · d300a4cd
  suolong committed Mar 05, 2026
  
  d300a4cd Browse Files
- 补全大部分缺少的图片 · bca50a55
  ludi committed Mar 05, 2026
  
  bca50a55 Browse Files
04 Mar, 2026 7 commits
- 添加一些未有的动画，pk模块已经更新完最新版本 · f27a227e
  ludi committed Mar 04, 2026
  
  f27a227e Browse Files
- 补一个run的bug · 05db1b19
  ludi committed Mar 04, 2026
  
  05db1b19 Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · 3632b6ed
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移

# Conflicts:
#	Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
```
  ludi committed Mar 04, 2026
  3632b6ed Browse Files
- 完成pkcontentview所有 · a1ee7196
  ludi committed Mar 04, 2026
  
  a1ee7196 Browse Files
- 修复播放小窗问题 · e7426994
  suolong committed Mar 04, 2026
  
  e7426994 Browse Files
- 修复连麦问题 · 3755332c
  suolong committed Mar 04, 2026
  
  3755332c Browse Files
- 修复连麦问题 · b2e801f6
  suolong committed Mar 04, 2026
  
  b2e801f6 Browse Files
03 Mar, 2026 5 commits
- 提交一些ui · dbdf522c
  ludi committed Mar 03, 2026
  
  dbdf522c Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · bb39a355
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  ludi committed Mar 03, 2026
  bb39a355 Browse Files
- 完成basemodel底层兼容 · e68face1
  ludi committed Mar 03, 2026
  
  e68face1 Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · e34a78f9
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  suolong committed Mar 03, 2026
  e34a78f9 Browse Files
- 更新下byteRTC配置 · 4cfd9c4f
  suolong committed Mar 03, 2026
  
  4cfd9c4f Browse Files
02 Mar, 2026 12 commits
- 调整pk面板 · 209ac1af
  ludi committed Mar 02, 2026
  
  209ac1af Browse Files
- 解决开播问题 · 566e92fc
  suolong committed Mar 02, 2026
  
  566e92fc Browse Files
- 接完连麦 · e3b71d54
  ludi committed Mar 02, 2026
  
  e3b71d54 Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · 7c3bba79
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  ludi committed Mar 02, 2026
  7c3bba79 Browse Files
- 正在搞连麦，上传一下 · 8db6b419
  ludi committed Mar 02, 2026
  
  8db6b419 Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · 7857be52
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  suolong committed Mar 02, 2026
  7857be52 Browse Files
- 添加liveData · 82deddd4
  suolong committed Mar 02, 2026
  
  82deddd4 Browse Files
- 完成礼物暴奖的逻辑，还有ui · d1ad68bd
  ludi committed Mar 02, 2026
  
  d1ad68bd Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · 216be65d
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  suolong committed Mar 02, 2026
  216be65d Browse Files
- 解决一些引用问题 · 2bc57bee
  suolong committed Mar 02, 2026
  
  2bc57bee Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · f2bb5d1f
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移

# Conflicts:
#	Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
```
  ludi committed Mar 02, 2026
  f2bb5d1f Browse Files
- 完成来自相关的逻辑 · e4e310c5
  ludi committed Mar 02, 2026
  
  e4e310c5 Browse Files
28 Feb, 2026 3 commits
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · 213bfc37
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移

# Conflicts:
#	Pods/Pods.xcodeproj/project.pbxproj
```
  suolong committed Feb 28, 2026
  213bfc37 Browse Files
- 提交部分 · 3be71cdb
  suolong committed Feb 28, 2026
  
  3be71cdb Browse Files
- 完成soundtouch的迁移 · 37a5ffd0
  ludi committed Feb 28, 2026
  
  37a5ffd0 Browse Files
26 Feb, 2026 1 commit
- 迁移惩罚相关的 · ad1c8caf
  ludi committed Feb 26, 2026
  
  ad1c8caf Browse Files
05 Feb, 2026 3 commits
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · e4236ffd
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  ludi committed Feb 05, 2026
  e4236ffd Browse Files
- 初步完成ffpkhelper对接 · 6e9aadd8
  ludi committed Feb 05, 2026
  
  6e9aadd8 Browse Files
- 连买的底层介入 · cd04eabd
  suolong committed Feb 05, 2026
  
  cd04eabd Browse Files
27 Jan, 2026 1 commit
- 补充下正常开播 · cf41be93
  suolong committed Jan 27, 2026
  
  cf41be93 Browse Files
23 Jan, 2026 2 commits
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · f4c2941f
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移

# Conflicts:
#	Pods/Pods.xcodeproj/project.pbxproj
```
  ludi committed Jan 23, 2026
  f4c2941f Browse Files
- 循环引用问题 · f6fd1040
  suolong committed Jan 23, 2026
  
  f6fd1040 Browse Files