jiaoyangna
|
e5cacccd8a
|
Merge branch 'china/dev-inner' into china/dev-c
|
2021-06-17 17:57:44 +08:00 |
jiaoyangna
|
687a9ea45d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-17 17:57:39 +08:00 |
jiaoyangna
|
4c1cd67e6e
|
Merge branch '0活动开发聚集地/惊喜礼盒' into china/dev-inner
|
2021-06-17 17:56:51 +08:00 |
ZhangBiao
|
9b6e14eeb1
|
【惊喜礼盒】完成!
|
2021-06-17 17:43:56 +08:00 |
jiaoyangna
|
5c09522231
|
Merge branch '0活动开发聚集地/惊喜礼盒' into china/dev-inner
|
2021-06-17 17:19:27 +08:00 |
ZhangBiao
|
87f3fa8f64
|
【惊喜礼盒】提交
|
2021-06-17 17:09:36 +08:00 |
gaoxin
|
ac7501a1d5
|
【战斗】修复群体性的免疫效果不会正常消失的问题
|
2021-06-17 16:01:48 +08:00 |
ZhangBiao
|
54bc0f2caa
|
【惊喜礼盒】提价
|
2021-06-17 15:26:10 +08:00 |
jiaoyangna
|
6f5cd1d44a
|
惊喜礼包推送
|
2021-06-17 15:21:22 +08:00 |
jiaoyangna
|
bc20fa57fc
|
惊喜礼包推送修改提交
|
2021-06-17 15:05:44 +08:00 |
jiaoyangna
|
b1e3d0a163
|
Merge branch '0功能/升星预览' into china/dev-c
|
2021-06-17 15:05:03 +08:00 |
gaoxin
|
23c17edfc7
|
【包配置】删除对喜扑的包的特殊处理
|
2021-06-17 10:43:39 +08:00 |
gaoxin
|
12bd0b64a1
|
Merge branch 'china/zf_test' into china/dev-c
# Conflicts:
# Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs
|
2021-06-17 10:26:13 +08:00 |
zhangqiang
|
8f97c36580
|
【鸿蒙阵】共鸣是breakId 计算修改
|
2021-06-17 10:10:22 +08:00 |
JieLing
|
6431157671
|
Merge remote-tracking branch 'origin/gx/china/stream' into china/zf_test
|
2021-06-17 10:01:56 +08:00 |
gaoxin
|
b8f9d894d9
|
【登录】修复logo为空时显示默认logo的问题
|
2021-06-16 20:38:42 +08:00 |
ZhangBiao
|
814fb29c45
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-16 19:56:18 +08:00 |
ZhangBiao
|
0b4c5f3c8f
|
【惊喜礼盒】提交
|
2021-06-16 19:56:10 +08:00 |
JieLing
|
447025cd5a
|
Merge branch 'gx/china/stream' into china/zf_test
|
2021-06-16 18:47:22 +08:00 |
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 |
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
|
a35b9d404b
|
数字修改提交
|
2021-06-16 15:14:36 +08:00 |
zhangqiang
|
aa666a5158
|
【公会】带神印的成员信息报错
|
2021-06-16 14:50:19 +08:00 |
ZhangBiao
|
656c8b3359
|
【惊喜礼盒】提交
|
2021-06-16 11:59:52 +08:00 |
jiaoyangna
|
b83e8902d7
|
【ID1009368】
添加升星预览功能
|
2021-06-16 11:16:41 +08:00 |
zhangqiang
|
feb6480759
|
【章节剧情】点击跳过没有返回挂机界面
|
2021-06-16 10:53:21 +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
|
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 |
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 |
jiaoyangna
|
fe1570f667
|
神将详情界面修改提交
|
2021-06-11 16:09:42 +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 |
wangzhenxing
|
588ca169c9
|
[战斗]======被动200去掉注释
|
2021-06-11 11:51:52 +08:00 |