smallqiang
|
37f42e84bf
Merge branch 'master' into qq
|
6 gadi atpakaļ |
tang biao
|
09f07efa2b
修改信息流的小问题
|
6 gadi atpakaļ |
tang biao
|
7458855bc4
更新信息流
|
6 gadi atpakaļ |
tang biao
|
3adb5bca2c
修改信息流错误
|
6 gadi atpakaļ |
tang biao
|
ba0ead5428
修复冲突
|
6 gadi atpakaļ |
tang biao
|
2a915d6e62
添加promise
|
6 gadi atpakaļ |
tang biao
|
bd77057349
修改global
|
6 gadi atpakaļ |
smallqiang
|
4ae1503b96
修改QQ广告播放
|
6 gadi atpakaļ |
smallqiang
|
195d64ce78
添加播放视频方法
|
6 gadi atpakaļ |
tang biao
|
e0fd7aaa7d
提交106版本
|
6 gadi atpakaļ |
tang biao
|
72a3cb4f28
修改信息流显示
|
6 gadi atpakaļ |
tang biao
|
3de08f671d
修改一些bug
|
6 gadi atpakaļ |
tang biao
|
27ebb52b28
发布新版105
|
6 gadi atpakaļ |
tang biao
|
50a189c308
修改bug
|
6 gadi atpakaļ |
tang biao
|
6d020be6fc
修改bug
|
6 gadi atpakaļ |
smallqiang
|
4422668850
修改技能重置
|
6 gadi atpakaļ |
smallqiang
|
69e9f69806
修改获取视频播放
|
6 gadi atpakaļ |
smallqiang
|
ca84c42475
删除多余代码
|
6 gadi atpakaļ |
smallqiang
|
f81afbe6f3
修改获取视频失败提示
|
6 gadi atpakaļ |
smallqiang
|
0a17bde45a
修改视频播放失败提示和加载游戏进度条显示
|
6 gadi atpakaļ |
tang biao
|
4d6a9df2c3
Merge branch 'dev' of http://svn.ouj.com:3000/DWG/taptapstar into dev
|
6 gadi atpakaļ |
tang biao
|
db00123b03
修复一点小问题
|
6 gadi atpakaļ |
smallqiang
|
ab66a35494
修改统计sdk和广告上限提示
|
6 gadi atpakaļ |
tang biao
|
23777a8e8e
处理冲突
|
6 gadi atpakaļ |
tang biao
|
f91f26ecf8
修改一些bug
|
6 gadi atpakaļ |
smallqiang
|
5b4079ad9e
添加观看视频上报
|
6 gadi atpakaļ |
smallqiang
|
16d7bdc260
Merge branch 'master' into dev
|
6 gadi atpakaļ |
smallqiang
|
4fac89f865
技能添加视频播放重置
|
6 gadi atpakaļ |
tang biao
|
1131681d19
修复技能分享和使用技能信息流问题
|
6 gadi atpakaļ |
tang biao
|
a4ae92734a
修改已知问题,适配商城
|
6 gadi atpakaļ |