Commit Graph

2577 Commits

Author SHA1 Message Date
Martin
96a6b05d03 修改佩戴勋章接口 2024-07-19 15:44:06 +08:00
ba8090eec7 Merge remote-tracking branch 'origin/dev_680_礼物展馆' into dev_680_礼物展馆 2024-07-19 09:27:12 +08:00
e1fd4949b5 update 2024-07-19 09:27:00 +08:00
Martin
08c46a7684 礼物墙-修复bug 2024-07-18 18:28:15 +08:00
gongduoxiang
3a12d848e1 Merge remote-tracking branch 'origin/master' 2024-07-18 18:20:53 +08:00
gongduoxiang
cf245b0df8 有些本地的东西不去提交 2024-07-18 18:19:08 +08:00
1cde41f2d0 fix 测试反馈内容 2024-07-18 18:16:34 +08:00
092d4cb914 调整礼物墙部分文案 2024-07-18 17:51:51 +08:00
余前卫
0ea92c00a2 6.8.0:小游戏结算界面,观众视角修改 2024-07-18 17:31:44 +08:00
21ae621343 fix 修复礼物墙测试问题 2024-07-18 16:55:36 +08:00
048c66736f fix 修复礼物墙测试问题 2024-07-18 16:39:06 +08:00
d3055d8fb2 fix 修复礼物墙测试问题 2024-07-18 13:25:42 +08:00
Martin
b9164b6a08 礼物墙
第三方登录-新增校验
2024-07-18 13:19:30 +08:00
Martin
67e5e4e02f 直播间礼物列表-冠名字段修改 2024-07-17 16:14:35 +08:00
Martin
2351618e5a 拒绝随机PK提示英化 2024-07-17 13:26:07 +08:00
Martin
b2e2ca7303 Merge remote-tracking branch 'origin/dev_680_礼物展馆' into dev_680_礼物展馆 2024-07-17 12:12:35 +08:00
714e51b621 update 2024-07-17 12:12:14 +08:00
efa4c25c4b update 2024-07-17 12:11:41 +08:00
Martin
854cad8ec6 Merge remote-tracking branch 'origin/dev_680_礼物展馆' into dev_680_礼物展馆 2024-07-17 11:07:20 +08:00
46fba9429d update 2024-07-17 11:06:52 +08:00
c67ed4b736 Merge branch 'refs/heads/master' into dev_680_礼物展馆 2024-07-17 10:55:38 +08:00
Martin
4a91aafb4b Merge branch 'master' into dev_680_礼物展馆 2024-07-17 10:54:41 +08:00
18142669586
a0f3f246a6 补充jar 2024-07-17 10:53:43 +08:00
Martin
2b20782def 修改配置文件 2024-07-17 10:18:41 +08:00
Martin
152848a04f Merge branch 'master' into dev_680_礼物展馆
# Conflicts:
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	gradle.properties
#	live/build.gradle
2024-07-17 09:53:22 +08:00
Martin
fe827482c9 游戏房上麦 2024-07-17 09:47:38 +08:00
7fc1c2e712 update 礼物墙 2024-07-16 17:24:42 +08:00
7a6dfe5a3d update 礼物墙 2024-07-16 16:39:30 +08:00
Martin
96c45820b0 荣誉成就 2024-07-16 16:11:27 +08:00
ac18150503 update 礼物墙 2024-07-16 11:15:12 +08:00
Martin
22b208bcd9 新增直播间冠名礼物特效 2024-07-16 10:31:18 +08:00
Martin
484069dac7 冠名礼物 2024-07-15 10:13:36 +08:00
ade837e85c update 礼物墙 调整间距 2024-07-15 10:06:06 +08:00
12a1f24101 update 礼物墙 布局 2024-07-15 09:47:12 +08:00
250d4832a3 update 礼物墙 布局文件 2024-07-13 21:45:10 +08:00
Martin
93db808f8b 佈局 2024-07-13 17:49:07 +08:00
Martin
59f0fa4acb 佈局 2024-07-13 17:02:59 +08:00
8fe6130c81 update 礼物墙 2024-07-13 16:51:37 +08:00
18142669586
a11d7f07e9 开播im未初始化 会在初始化一次。 2024-07-13 11:26:24 +08:00
18142669586
90bc70ebf7 Merge remote-tracking branch 'origin/master' 2024-07-13 10:38:03 +08:00
18142669586
4618c0a4f1 升级34 grd8.0 2024-07-13 10:37:37 +08:00
9292e6f5c5 Merge remote-tracking branch 'origin/dev_680_礼物展馆' into dev_680_礼物展馆
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
2024-07-13 09:29:11 +08:00
845b217c4d 新增礼物墙相关内容 2024-07-13 09:28:02 +08:00
Martin
7edd75e223 礼物墙功能 2024-07-13 09:27:11 +08:00
Martin
15a52aaa62 1、开通守护,im消息优化
2、游戏房安全区域优化
3、举报接口新增字段区分
2024-07-11 13:07:17 +08:00
余前卫
6d6010d023 Merge branch 'master' of https://gitee.com/xxkp/pdlivexp
# Conflicts:
#	app/build.gradle
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values/strings.xml
2024-07-10 10:53:01 +08:00
Martin
94156e2984 Merge branch '直播间提示优化'
# Conflicts:
#	config.gradle
2024-07-09 13:49:31 +08:00
Martin
769f527565 1、開通守護-使用優惠券
2、开通贵族,在当前直播间有围观按钮问题
2024-07-09 13:08:33 +08:00
Martin
eb9f615f70 将支付相关的异常抛出,改为异常输出 2024-07-09 11:11:05 +08:00
Martin
3dcc801331 1、開通守護-使用優惠券 2024-07-05 13:58:35 +08:00