gaoxin
|
6bd67926e7
|
【包配置】优化登录界面的打开速度,添加登录界面视频背景配置字段
|
2021-06-16 18:46:46 +08:00 |
JieLing
|
18be3ba841
|
Merge branch 'gx/china/stream' into china/zf_test
|
2021-06-16 18:35:39 +08:00 |
gaoxin
|
3b68cd422f
|
【无用log】
|
2021-06-16 18:35:07 +08:00 |
JieLing
|
964c216ecc
|
Merge branch 'gx/china/stream' into china/zf_test
|
2021-06-16 18:33:49 +08:00 |
gaoxin
|
6cf9492d06
|
【优化更新界面显示】
|
2021-06-16 18:23:30 +08:00 |
jiaoyangna
|
9f2e0dbfd0
|
【ID1009503】 每日豪礼文字重新包装
|
2021-06-16 18:05:57 +08:00 |
gaoxin
|
c86cf619d0
|
【视频背景】尝试修复部分机型视频背景显示黑屏的问题
|
2021-06-16 17:30:54 +08:00 |
gaoxin
|
98b1518306
|
【添加stream配置】
|
2021-06-16 17:29:17 +08:00 |
jiaoyangna
|
27bfb84fb5
|
问号大小修改提交
|
2021-06-16 15:29:29 +08:00 |
jiaoyangna
|
0bfea18692
|
问号大小修改
|
2021-06-16 15:25:48 +08:00 |
jiaoyangna
|
a35b9d404b
|
数字修改提交
|
2021-06-16 15:14:36 +08:00 |
jiaoyangna
|
c5ecf50429
|
修改问号位置
|
2021-06-16 15:12:05 +08:00 |
zhangqiang
|
aa666a5158
|
【公会】带神印的成员信息报错
|
2021-06-16 14:50:19 +08:00 |
ZhangBiao
|
656c8b3359
|
【惊喜礼盒】提交
|
2021-06-16 11:59:52 +08:00 |
gaoxin
|
fbd02f1a29
|
【工具】热更和打包工具完成后自动提交
|
2021-06-16 11:47:07 +08:00 |
gaoxin
|
0814f45cfa
|
【热更】先遣服相关热更配置添加,腾讯云路径刷新功能添加
|
2021-06-16 11:47:00 +08:00 |
jiaoyangna
|
b83e8902d7
|
【ID1009368】
添加升星预览功能
|
2021-06-16 11:16:41 +08:00 |
zhangqiang
|
feb6480759
|
【章节剧情】点击跳过没有返回挂机界面
|
2021-06-16 10:53:21 +08:00 |
gaoxin
|
488f1e8af0
|
【stream】外部资源添加
|
2021-06-16 10:48:53 +08:00 |
JieLing
|
b7e78d9d5f
|
Revert Revert "【包配置】将登录图配置放到streaming文件夹"
|
2021-06-16 10:44:12 +08:00 |
gaoxin
|
b3fca866e8
|
Revert "【山河试炼】开坑"
This reverts commit 4df5b08d1f.
|
2021-06-16 10:09:15 +08:00 |
gaoxin
|
3dc9dd5d64
|
Revert "【山河试炼】界面提交"
This reverts commit fbc5316b01.
|
2021-06-16 10:09:04 +08:00 |
gaoxin
|
0e2ec48bdc
|
Revert "【山河试炼】代码提交"
This reverts commit 8cd3afb034.
|
2021-06-16 10:08:52 +08:00 |
gaoxin
|
a4fa7cacff
|
Revert "【山河试炼】差红点的检测"
This reverts commit 160a3e1a6f.
|
2021-06-16 10:08:41 +08:00 |
gaoxin
|
67e44741f6
|
Revert "【山河试炼】增加主城红点检测"
This reverts commit e0e8974850.
|
2021-06-16 10:08:34 +08:00 |
ZhangBiao
|
e0e8974850
|
【山河试炼】增加主城红点检测
|
2021-06-15 20:39:05 +08:00 |
ZhangBiao
|
160a3e1a6f
|
【山河试炼】差红点的检测
|
2021-06-15 20:33:22 +08:00 |
ZhangBiao
|
8cd3afb034
|
【山河试炼】代码提交
|
2021-06-15 15:46:01 +08:00 |
gaoxin
|
ab11a7c233
|
【工具】热更和打包工具完成后自动提交
|
2021-06-15 15:23:05 +08:00 |
gaoxin
|
41dfe3f056
|
【热更】先遣服相关热更配置添加,腾讯云路径刷新功能添加
|
2021-06-15 14:46:30 +08:00 |
ZhangBiao
|
fbc5316b01
|
【山河试炼】界面提交
|
2021-06-15 14:25:22 +08:00 |
zhangqiang
|
75cbaba02e
|
【章节剧情】点击跳过没有返回挂机界面
|
2021-06-15 12:17:13 +08:00 |
ZhangBiao
|
173fef6dca
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-15 11:40:56 +08:00 |
ZhangBiao
|
4df5b08d1f
|
【山河试炼】开坑
|
2021-06-15 11:40:47 +08:00 |
gaoxin
|
13d7b61e35
|
【神将信息】修复切换到装备界面返回无法切换页签的问题
|
2021-06-15 11:17:15 +08:00 |
ZhangBiao
|
6152c52f2c
|
【牛气冲天】阶段性奖励中的自选箱,点击后可见自选箱的神将内容
|
2021-06-15 10:22:32 +08:00 |
gaoxin
|
46c1fb1070
|
【森罗】修复转盘游戏点击报错
|
2021-06-11 20:40:10 +08:00 |
gaoxin
|
2140a69391
|
【森罗】修复转盘游戏点击报错
|
2021-06-11 20:15:44 +08:00 |
gaoxin
|
eb27240907
|
【热更】修复草花cdn报错
|
2021-06-11 19:26:20 +08:00 |
gaoxin
|
2a945825d9
|
【热更】修复草花cdn报错
|
2021-06-11 19:24:04 +08:00 |
gaoxin
|
57ece39059
|
【热更】添加草花和灵动专服的配置
|
2021-06-11 18:28:32 +08:00 |
gaoxin
|
8df099eabc
|
【资源】草花loading图替换
|
2021-06-11 18:28:05 +08:00 |
gaoxin
|
c9d6c66259
|
【热更】添加草花和灵动专服的配置
|
2021-06-11 18:02:42 +08:00 |
gaoxin
|
0f68517a69
|
【资源】草花loading图替换
|
2021-06-11 17:37:32 +08:00 |
gaoxin
|
20dd0067d3
|
【资源】喜扑登录背景图替换
|
2021-06-11 16:11:01 +08:00 |
gaoxin
|
627a623a37
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-11 16:10:33 +08:00 |
gaoxin
|
ebd4135226
|
【资源】喜扑登录背景图替换
|
2021-06-11 16:10:12 +08:00 |
jiaoyangna
|
fe1570f667
|
神将详情界面修改提交
|
2021-06-11 16:09:42 +08:00 |
JieLing
|
8c161a0ddd
|
Merge branch 'china/zf_test' of http://60.1.1.230/gaoxin/JL_Client into china/zf_test
|
2021-06-11 15:43:25 +08:00 |
ZhangBiao
|
4edff2eee8
|
【升级限量礼包】无剩余礼包逻辑缺失修复
(cherry picked from commit ca9a0199b7)
|
2021-06-11 14:10:10 +08:00 |
ZhangBiao
|
173773517f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-11 14:05:17 +08:00 |
ZhangBiao
|
ca9a0199b7
|
【升级限量礼包】无剩余礼包逻辑缺失修复
|
2021-06-11 14:05:03 +08:00 |
gaoxin
|
3ba5186b7b
|
【热更】没有更新 files文件
|
2021-06-11 13:19:22 +08:00 |
gaoxin
|
ee8577248e
|
【热更】没有更新 files文件
|
2021-06-11 13:16:55 +08:00 |
gaoxin
|
9ec33b5c6d
|
【热更】添加测试服和喜扑的配置
|
2021-06-11 13:04:29 +08:00 |
gaoxin
|
41af3c5db2
|
【热更新工具】
|
2021-06-11 13:04:22 +08:00 |
gaoxin
|
65e7971693
|
【热更】添加测试服和喜扑的配置
|
2021-06-11 13:02:12 +08:00 |
gaoxin
|
7cb79b4de3
|
【热更新工具】
|
2021-06-11 12:46:14 +08:00 |
wangzhenxing
|
588ca169c9
|
[战斗]======被动200去掉注释
|
2021-06-11 11:51:52 +08:00 |
zhangqiang
|
a9ce0d077e
|
【章节剧情】点击跳过没有返回挂机界面
|
2021-06-11 10:58:51 +08:00 |
jiaoyangna
|
ed4472a298
|
挂机卡死修改提交
|
2021-06-11 10:48:11 +08:00 |
jiaoyangna
|
e89a0d26c8
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-11 10:31:16 +08:00 |
jiaoyangna
|
2419089ff4
|
【ID1016454】
【使用跳转】寻仙玉在活动未开启时,点击使用按钮,没有合理提示
|
2021-06-11 10:30:57 +08:00 |
jiaoyangna
|
11bb03fd2b
|
【ID1016454】
【使用跳转】寻仙玉在活动未开启时,点击使用按钮,没有合理提示
|
2021-06-11 10:18:38 +08:00 |
gaoxin
|
06875b8986
|
【包配置】喜扑多渠道处理
|
2021-06-11 08:58:15 +08:00 |
gaoxin
|
28c7d285a0
|
Revert "【包配置】将登录图配置放到streaming文件夹"
This reverts commit 03d56901d7.
|
2021-06-11 02:36:08 +08:00 |
gaoxin
|
03d56901d7
|
【包配置】将登录图配置放到streaming文件夹
|
2021-06-11 01:48:39 +08:00 |
gaoxin
|
77acfd6bcd
|
【登录】版号信息走表配置
|
2021-06-11 01:45:09 +08:00 |
jiaoyangna
|
e764f74e6d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 23:01:07 +08:00 |
jiaoyangna
|
65860bb337
|
删除剧情对话挂机地图音效
|
2021-06-10 22:59:26 +08:00 |
gaoxin
|
4ee928c2d4
|
Merge remote-tracking branch 'origin/china/zf_test' into china/dev-c
|
2021-06-10 22:56:18 +08:00 |
JieLing
|
0f0ba0dfc2
|
【包配置】灵动正式服数数appid修改
|
2021-06-10 22:53:46 +08:00 |
JieLing
|
530374e00b
|
【资源】循环引用资源优化
|
2021-06-10 22:53:11 +08:00 |
jiaoyangna
|
b76f517cbb
|
[战斗]===============被动200修改 同阵营这个被动只会触发一次
|
2021-06-10 22:08:51 +08:00 |
wangzhenxing
|
4165e6acd5
|
【战斗】=======注释之前被动200修改
|
2021-06-10 22:02:35 +08:00 |
wangzhenxing
|
77121e01e3
|
[战斗]=========被动200 同一个阵营如果有多个200被动 只会生效一个
|
2021-06-10 21:57:00 +08:00 |
jiaoyangna
|
83553d8aef
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 20:17:03 +08:00 |
jiaoyangna
|
04633b4ece
|
无尽副本快速返回主城报错
|
2021-06-10 20:16:44 +08:00 |
zhangqiang
|
23f90ccf52
|
【线上】【鸿蒙阵】共鸣装备无法卸下,弹服务器开小差
|
2021-06-10 18:37:16 +08:00 |
JieLing
|
2e798c6888
|
【资源名重复】
|
2021-06-10 18:24:59 +08:00 |
zhangqiang
|
5d57464da8
|
【森罗音效】福星高照老头的音效,界面关闭不停
|
2021-06-10 17:56:07 +08:00 |
jiaoyangna
|
529067bb2f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 17:44:20 +08:00 |
jiaoyangna
|
e087d4c57c
|
ID1016424】
【无尽副本】反复从无尽地图返回主城报错
|
2021-06-10 17:43:52 +08:00 |
zhangqiang
|
4915842ee2
|
【山河社稷图】奖励排序
|
2021-06-10 17:05:51 +08:00 |
jiaoyangna
|
ddd0ece70b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 16:38:43 +08:00 |
jiaoyangna
|
819278dd3d
|
【ID1016436】
【无尽副本】战斗结算界面有经验
|
2021-06-10 16:38:19 +08:00 |
gaoxin
|
fbe1acdf43
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 16:38:18 +08:00 |
gaoxin
|
8494dd02d7
|
【立绘错位】尝试修复神将卡牌上有时会出现立绘错位
|
2021-06-10 16:37:44 +08:00 |
zhangqiang
|
3506d2bb2c
|
【页签图标替换】局部 + 修行提示文字修改
|
2021-06-10 16:33:43 +08:00 |
jiaoyangna
|
8115705d1a
|
【ID1016422】
【无尽副本】自动恢复行动力倒计时结束后,行动力不增加
|
2021-06-10 16:30:49 +08:00 |
gaoxin
|
0458ee7bf7
|
【debug】修复部分报错导致报错的问题。。。
|
2021-06-10 16:11:02 +08:00 |
gaoxin
|
4382e822e0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 16:10:18 +08:00 |
gaoxin
|
aa4f3df8b0
|
【拍脸】优化短时间触发拍脸有可能导致报错的问题
|
2021-06-10 16:10:12 +08:00 |
jiaoyangna
|
f5a9a1368d
|
【ID1016422】
【无尽副本】自动恢复行动力倒计时结束后,行动力不增加
|
2021-06-10 16:08:26 +08:00 |
jiaoyangna
|
fed713464c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 16:00:23 +08:00 |
gaoxin
|
dd19b43dd6
|
【特效】修复特权商城扫光特效显示错误
|
2021-06-10 15:54:57 +08:00 |
jiaoyangna
|
cd4232304a
|
【ID1016435】
【首充】修改“赠40连抽”文字
|
2021-06-10 15:54:21 +08:00 |
gaoxin
|
3f47beac93
|
【支付】透传参数添加cc值
|
2021-06-10 15:20:31 +08:00 |
gaoxin
|
ad2c3b84df
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 15:17:46 +08:00 |
gaoxin
|
43ae66d0d1
|
【音效】新增孙悟空,玉皇大帝,哪吒普攻特效,崇黑虎、蚩尤技能音效
|
2021-06-10 15:17:35 +08:00 |
gaoxin
|
0915c18368
|
【ID1009452】 增加森罗幻境老虎机音效
|
2021-06-10 15:16:17 +08:00 |
zhangqiang
|
b3578a5ba4
|
【音效】跳转不同界面再返回,音效没有跟着切换
|
2021-06-10 14:50:28 +08:00 |
zhangqiang
|
18950a2326
|
【山河社稷图】章节图标修改
|
2021-06-10 14:43:45 +08:00 |
zhangqiang
|
0598fe8bdf
|
【修行特效】
|
2021-06-10 13:45:23 +08:00 |
gaoxin
|
a943681b63
|
【工具】热更工具添加同步GIT的功能
|
2021-06-10 10:32:10 +08:00 |
gaoxin
|
5005b0975a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 20:30:42 +08:00 |
gaoxin
|
362e7ab9aa
|
【打包工具】修改出包的记录时间为24小时制
|
2021-06-09 20:30:10 +08:00 |
zhangqiang
|
8b4aa53984
|
【心魔试炼】3
|
2021-06-09 20:29:50 +08:00 |
gaoxin
|
1a12b261d5
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 20:20:38 +08:00 |
gaoxin
|
07a35aec13
|
【幸运探宝】按钮位置修改
|
2021-06-09 20:20:16 +08:00 |
zhangqiang
|
d21ebe57bb
|
【心魔试炼】2
|
2021-06-09 20:12:11 +08:00 |
zhangqiang
|
d91c57f6ea
|
【心魔试炼】
|
2021-06-09 19:48:28 +08:00 |
jiaoyangna
|
ad0da1e940
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 18:48:52 +08:00 |
jiaoyangna
|
7c1d58b3eb
|
青龙秘宝修改 提交
|
2021-06-09 18:48:24 +08:00 |
gaoxin
|
bfb77649ba
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 18:29:14 +08:00 |
gaoxin
|
d96a03bd57
|
【特效】修复崇黑虎技能显示错误
|
2021-06-09 18:27:55 +08:00 |
jiaoyangna
|
cf47376987
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 18:24:56 +08:00 |
jiaoyangna
|
fdc4d2f203
|
【ID1009398】
【青龙秘宝】解锁秘宝界面显示奖励 ,无尽秘宝同理
|
2021-06-09 18:24:27 +08:00 |
gaoxin
|
53b2ae451f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 18:18:52 +08:00 |
gaoxin
|
a10d34b076
|
【逐胜之巅】入口资源添加文字
|
2021-06-09 18:18:35 +08:00 |
zhangqiang
|
05b55bce02
|
【山河社稷图读取关卡界面音乐】
|
2021-06-09 18:17:22 +08:00 |
jiaoyangna
|
ebfd313e12
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 18:14:43 +08:00 |
jiaoyangna
|
70cc891df2
|
【ID1009443】
【无尽副本】地图描述同时根据地图ID和当前玩家所在等级段来读取,并根据不同等级段读取副本标题
|
2021-06-09 18:14:26 +08:00 |
gaoxin
|
3dd0e302b2
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 18:11:12 +08:00 |
gaoxin
|
c895ce0faf
|
【战斗】优化指定目标特效显示错误的问题
|
2021-06-09 18:11:07 +08:00 |
jiaoyangna
|
c40c6640c9
|
【ID1009443】
【无尽副本】地图描述同时根据地图ID和当前玩家所在等级段来读取,并根据不同等级段读取副本标题
|
2021-06-09 18:02:05 +08:00 |
jiaoyangna
|
20d50b84f2
|
ID1009443】
【无尽副本】地图描述同时根据地图ID和当前玩家所在等级段来读取
|
2021-06-09 17:51:54 +08:00 |
jiaoyangna
|
37d36a511f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 17:45:29 +08:00 |
jiaoyangna
|
970a96b4f4
|
【ID1016342】
【解锁秘宝优化】激活可直接领取奖励预览中,没有显示专属奖励
|
2021-06-09 17:45:13 +08:00 |
gaoxin
|
930a16b2e7
|
【sdk】登录参数空值处理
|
2021-06-09 17:13:37 +08:00 |
gaoxin
|
8bdda8e1a8
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 17:09:52 +08:00 |
gaoxin
|
86985803ba
|
【战斗】修复受击特效显示位置错误
|
2021-06-09 17:09:39 +08:00 |
jiaoyangna
|
f0b9e1d8e6
|
Revert "玲珑宝镜提交"
This reverts commit 8c0a90ef78.
|
2021-06-09 17:09:14 +08:00 |
jiaoyangna
|
719bfe5a1a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 17:08:05 +08:00 |
jiaoyangna
|
8c0a90ef78
|
玲珑宝镜提交
|
2021-06-09 17:07:48 +08:00 |
jiaoyangna
|
ae9d3ea396
|
无尽任务特效改提交
|
2021-06-09 17:02:04 +08:00 |
gaoxin
|
1d4fcbae08
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 16:47:33 +08:00 |
gaoxin
|
c629520726
|
【特效】优化蚩尤特效的技能表现
|
2021-06-09 16:47:28 +08:00 |
zhangqiang
|
768ae7dea0
|
【部分美术效果无法展示】2
|
2021-06-09 16:21:38 +08:00 |
gaoxin
|
844e265453
|
【特效】修复部分技能特效显示异常的问题
|
2021-06-09 16:05:19 +08:00 |
gaoxin
|
b256e13889
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 16:04:43 +08:00 |
gaoxin
|
06d6e90b49
|
【添加CC值】用于判断渠道
|
2021-06-09 16:04:38 +08:00 |
zhangqiang
|
9a1f0078df
|
【部分美术效果无法展示】1
|
2021-06-09 15:58:04 +08:00 |
JieLing
|
f25cd6531c
|
【包配置】灵动包相关参数配置
|
2021-06-09 15:33:19 +08:00 |
gaoxin
|
c66418f287
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 15:01:01 +08:00 |
gaoxin
|
5a54f51107
|
【主界面】逐胜之巅资源替换
|
2021-06-09 15:00:49 +08:00 |
jiaoyangna
|
ef37292ac2
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 14:58:29 +08:00 |
jiaoyangna
|
67bed99433
|
【ID1009324】
剧情动画中去掉背景挂机时的音效(战斗,走路脚步声)
|
2021-06-09 14:58:11 +08:00 |
gaoxin
|
9a164336fa
|
【资源】战斗背景替换,主界面删除转盘
|
2021-06-09 14:52:00 +08:00 |
zhangqiang
|
04fba6a182
|
【页签优化】游戏内分页签高度距离统一化
|
2021-06-09 12:32:30 +08:00 |
gaoxin
|
e1a87a10e4
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 12:18:19 +08:00 |
gaoxin
|
cf878427ef
|
【礼包】获取结束时间时添加判空操作
|
2021-06-09 12:18:14 +08:00 |
jiaoyangna
|
cd46af8ab0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 12:04:40 +08:00 |
jiaoyangna
|
9a61e6b709
|
【无尽副本】只有第一次完成任务会有光效,后续完成不会有
|
2021-06-09 12:04:22 +08:00 |
gaoxin
|
40768a423d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 11:49:16 +08:00 |
gaoxin
|
cdfb7277f9
|
【礼包】礼包不存在添加判空操作,不再卡死
|
2021-06-09 11:49:11 +08:00 |
jiaoyangna
|
c16b1124f8
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 11:25:24 +08:00 |
jiaoyangna
|
a54e1088e6
|
【ID1009398】
【青龙秘宝】解锁秘宝界面显示奖励 ,无尽秘宝同理
|
2021-06-09 11:25:05 +08:00 |
wangzhenxing
|
0f8ce2017f
|
[bug]=========【ID1016289】
【称号】唯我独尊这类称号位置需要调整
|
2021-06-09 11:24:58 +08:00 |
zhangqiang
|
53c42a56f7
|
【线上】【特权】属性加成位置缺少黑色半透图层
|
2021-06-09 11:20:05 +08:00 |
jiaoyangna
|
bf5c4197ce
|
【ID1009418】
【无尽副本】购买行动力任务,点击前往按钮关闭弹窗并打开购买行动力界面
|
2021-06-09 11:03:18 +08:00 |
wangzhenxing
|
9914b6ef76
|
[公会福利红包]========红包红点优化
|
2021-06-09 10:35:11 +08:00 |
jiaoyangna
|
d1bd1a9cb7
|
【ID1009397】
四元阵增加置换玉获取提示
|
2021-06-09 10:12:00 +08:00 |
gaoxin
|
3c8ada285b
|
【资源】新增草花登录背景图
|
2021-06-09 10:01:32 +08:00 |
zhangqiang
|
4e91eda734
|
【弥核桃专服场景】
|
2021-06-09 09:39:37 +08:00 |
jiaoyangna
|
71c2278917
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-08 21:08:38 +08:00 |
jiaoyangna
|
3d38a63266
|
【ID1009231】
【公会红包】拥有福利红包时,退出公会加提示
|
2021-06-08 21:08:16 +08:00 |
zhangqiang
|
a0526542cf
|
【猕猴桃专服配置添加】
|
2021-06-08 21:01:59 +08:00 |
jiaoyangna
|
69bd345ed4
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-08 20:47:23 +08:00 |
jiaoyangna
|
d91a94d309
|
【ID1009380】
【公会】公会信息弹窗上添加【?】按钮
|
2021-06-08 20:47:03 +08:00 |
gaoxin
|
4876c365f3
|
【工具】添加灵动专服打包配置
|
2021-06-08 20:36:16 +08:00 |
jiaoyangna
|
b85ddde17f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-08 20:27:19 +08:00 |
jiaoyangna
|
4d9d970907
|
【ID1009372】
点将台10连跳过保留橙将动画
|
2021-06-08 20:27:00 +08:00 |
gaoxin
|
fad04ec385
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-08 19:29:35 +08:00 |
gaoxin
|
c1ebbaa0b2
|
【sdk】修复sdk无法登录的问题,修改支付时的透传参数
|
2021-06-08 19:29:21 +08:00 |
jiaoyangna
|
4dfe018e82
|
【ID1009397】
四元阵增加置换玉获取提示
|
2021-06-08 18:19:14 +08:00 |
jiaoyangna
|
470e7c4430
|
【ID1009379】
【无尽副本】任务完成后右侧按钮添加光效,与关卡界面相同
|
2021-06-08 18:07:22 +08:00 |
jiaoyangna
|
86f79bee97
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-08 17:58:43 +08:00 |
jiaoyangna
|
2ed4480d92
|
【ID1009398】
【青龙秘宝】解锁秘宝界面显示奖励 ,无尽秘宝同理
|
2021-06-08 17:57:59 +08:00 |
gaoxin
|
c2961f8f2d
|
【sdk登录】新增两个参数extData 和 p_appId 草花渠道使用
|
2021-06-08 17:27:24 +08:00 |
jiaoyangna
|
9681a00816
|
【ID1009395】
点将台增加剩余保底次数显示
|
2021-06-08 15:15:13 +08:00 |
jiaoyangna
|
debd1f0a63
|
心愿抽卡 资源提交
|
2021-06-08 14:55:06 +08:00 |
gaoxin
|
1e3447f4d9
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-08 14:06:17 +08:00 |
gaoxin
|
498bc9a9b5
|
【称号】显示再优化,老包也能正常显示
|
2021-06-08 14:06:12 +08:00 |
jiaoyangna
|
7544256d4e
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-08 11:40:58 +08:00 |
jiaoyangna
|
0d5c47f347
|
【ID1016261】
【灵兽宝阁】灵兽宝阁白泽假战斗结束报错
|
2021-06-08 11:40:40 +08:00 |
gaoxin
|
52e975ccf6
|
【资源】重复名资源修正
|
2021-06-08 11:05:54 +08:00 |
gaoxin
|
8d6168a7d9
|
【称号】优化称号在老包中的显示
|
2021-06-08 11:04:11 +08:00 |
gaoxin
|
be558c88f8
|
【特效】修复新称号特效显示错误
|
2021-06-07 21:28:45 +08:00 |
gaoxin
|
589795813b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-07 20:56:11 +08:00 |
jiaoyangna
|
24e2646bb8
|
心愿抽卡十连 报错修改
|
2021-06-07 18:06:23 +08:00 |
gaoxin
|
1b55441abc
|
【配置】新增草花渠道相关配置
|
2021-06-07 16:49:58 +08:00 |
jiaoyangna
|
3b5af67d93
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-07 16:45:03 +08:00 |
jiaoyangna
|
54cc26cb51
|
图片替换修改提交
|
2021-06-07 16:44:42 +08:00 |
gaoxin
|
e971d8e96d
|
【资源】特效根节点transform正确性修复
|
2021-06-07 14:40:38 +08:00 |
ZhangBiao
|
21ba0c629d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-07 13:32:09 +08:00 |
ZhangBiao
|
6c31fa860d
|
【右上角活动】红点修改
|
2021-06-07 13:32:01 +08:00 |
gaoxin
|
b3eaeb7eb5
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-07 12:04:55 +08:00 |
gaoxin
|
6c23cb0069
|
【特效】蚩尤,崇黑虎特效优化,孙悟空,哪吒,玉皇大帝普通攻击特效添加
|
2021-06-07 12:04:50 +08:00 |
jiaoyangna
|
605073d7ec
|
无尽商店返回无尽副本关闭修改提交
|
2021-06-07 12:00:05 +08:00 |
jiaoyangna
|
4c7decb60b
|
礼包预设特效修改
|
2021-06-07 11:30:01 +08:00 |
ZhangBiao
|
88e8fe21f6
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-07 11:18:47 +08:00 |
ZhangBiao
|
a96a61ec77
|
【逐胜之巅】入口调整至左侧
|
2021-06-07 11:18:37 +08:00 |
gaoxin
|
6308f73308
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua
# Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua
|
2021-06-07 11:00:32 +08:00 |
JieLing
|
8d233c01eb
|
【禁言功能】
|
2021-06-07 10:57:05 +08:00 |
gaoxin
|
24ebb4cf9e
|
【热更工具】添加查看热更文件的界面
|
2021-06-07 10:39:27 +08:00 |
gaoxin
|
b95a511dc2
|
【log】manager lateupdate 报错添加一些提示
|
2021-06-07 10:38:47 +08:00 |
gaoxin
|
0b5c529de4
|
【资源】特效资源修正
|
2021-06-05 15:19:43 +08:00 |
gaoxin
|
2db2a38484
|
【资源】蚩尤,崇黑虎特效资源上传
|
2021-06-05 15:10:02 +08:00 |
jiaoyangna
|
c82afde747
|
删除log
|
2021-06-05 11:43:01 +08:00 |
jiaoyangna
|
cbfe1db769
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-05 11:18:45 +08:00 |
jiaoyangna
|
46b4e3cd84
|
删除log
|
2021-06-05 11:18:13 +08:00 |
ZhangBiao
|
f4e645df07
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-05 11:15:07 +08:00 |
ZhangBiao
|
d744c010bf
|
【主城】红点
|
2021-06-05 11:14:36 +08:00 |
jiaoyangna
|
1912473cbe
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-05 11:04:46 +08:00 |
jiaoyangna
|
b5dda1e81c
|
剧情跳过修改提交
|
2021-06-05 11:04:28 +08:00 |
gaoxin
|
0e85d88c21
|
【剧情】修复连续跳过导致卡死的问题
|
2021-06-05 03:10:19 +08:00 |
gaoxin
|
9a6f978eee
|
【界面销毁时间修改为5秒】
|
2021-06-05 01:57:51 +08:00 |
gaoxin
|
3204bd5945
|
【upview】优化被关闭后依然可以通过事件触发报错的问题
|
2021-06-05 00:25:54 +08:00 |
gaoxin
|
518cb7dac1
|
【无用log】
|
2021-06-04 23:59:31 +08:00 |
gaoxin
|
fe517d91ed
|
【红点】还原清空所有红点的操作
|
2021-06-04 23:56:09 +08:00 |
gaoxin
|
206fcf9d92
|
【红点】修复部分红点被错误清除的问题
|
2021-06-04 23:54:59 +08:00 |
gaoxin
|
97cb753d4e
|
【引导】没有引导的功能解锁时会导致报错
|
2021-06-04 23:31:39 +08:00 |
gaoxin
|
717994657e
|
【无尽副本】界面适配调整
|
2021-06-04 22:35:43 +08:00 |
gaoxin
|
7395441fa3
|
【UI】延长界面销毁时间
|
2021-06-04 22:34:40 +08:00 |
gaoxin
|
65b62e7116
|
【meta】
|
2021-06-04 22:34:10 +08:00 |
gaoxin
|
70d78be2f6
|
【更新界面】修改背景图的加载位置
|
2021-06-04 21:11:40 +08:00 |
gaoxin
|
770b4e57a5
|
【更新界面】删除背景处理
|
2021-06-04 20:35:33 +08:00 |
gaoxin
|
9c17db0f82
|
【登录】删除版号信息显示
|
2021-06-04 20:33:47 +08:00 |
gaoxin
|
1a14550cd7
|
【添加无损压缩的文件夹】
|
2021-06-04 20:31:58 +08:00 |
ZhangBiao
|
a549f0c45b
|
【礼包】特效层级问题修改
|
2021-06-04 18:52:23 +08:00 |
ZhangBiao
|
39180183a9
|
【任务头像】红点问题修改
|
2021-06-04 18:41:32 +08:00 |
gaoxin
|
791233463b
|
【登录】更换登录图
|
2021-06-04 18:09:40 +08:00 |
gaoxin
|
22a4c87a5b
|
【背景图】优化背景图的大小
|
2021-06-04 18:06:44 +08:00 |
ZhangBiao
|
f0cd4b3bc0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-04 16:10:28 +08:00 |
ZhangBiao
|
4b708011bc
|
【玩家信息】红点问题修复 和log清楚
|
2021-06-04 16:10:17 +08:00 |
gaoxin
|
d448c1189a
|
【登录】修复logo配置不生效
|
2021-06-04 16:09:52 +08:00 |
gaoxin
|
b30359d2f5
|
【战斗】心魔试炼背景图修改
|
2021-06-04 15:17:43 +08:00 |
gaoxin
|
746e92f23d
|
【战斗】日常副本,无尽副本,山河社稷图战斗背景修改
|
2021-06-04 15:01:48 +08:00 |
gaoxin
|
c067b888d3
|
【登录视频】如果登录视频加载失败不再播放,战斗还原boss关卡不能跳过的功能
|
2021-06-04 14:53:37 +08:00 |
wangzhenxing
|
6158f0916a
|
[福利红包]=====红包红点修改
|
2021-06-04 14:19:16 +08:00 |
gaoxin
|
9bb57b48a5
|
【 包配置】添加判空
|
2021-06-04 12:01:08 +08:00 |
gaoxin
|
50f10993c4
|
【包配置】不再使用包名进行配置
|
2021-06-04 11:49:12 +08:00 |
gaoxin
|
bc65257ac7
|
【战斗】跳过提示修改为25级
|
2021-06-04 11:18:46 +08:00 |
gaoxin
|
eda07761fc
|
【登录】尝试修复在登录界面无法使用sdk切换账号的问题
|
2021-06-04 10:47:07 +08:00 |
gaoxin
|
f708fb6671
|
【登录视频】优化静态背景切换到视频的效果
|
2021-06-04 10:08:57 +08:00 |
gaoxin
|
a83f6848a7
|
【闪屏】修复部分机型健康提示显示不全的问题
|
2021-06-04 09:49:08 +08:00 |
gaoxin
|
3eb84202f2
|
【登录】修改特效依然再喜扑的包里显示的问题
|
2021-06-03 23:03:09 +08:00 |
gaoxin
|
079afb4e8d
|
Revert "【Debug】红点不消失问题debug日志添加"
This reverts commit d20e47535e.
|
2021-06-03 22:37:30 +08:00 |
gaoxin
|
793bb12c8c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-03 21:32:49 +08:00 |