gaoxin
|
2db591318f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:45:19 +08:00 |
gaoxin
|
6f52e3e338
|
【bug】统一一键合成时的文字提示
|
2021-03-17 16:45:13 +08:00 |
wangzhenxing
|
7d576d8c0c
|
[战斗]=============被动225修改 增加最大血量客户端特殊处理
|
2021-03-17 16:43:28 +08:00 |
jiaoyangna
|
adb3a1e750
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:20:22 +08:00 |
ZhangBiao
|
2e685100ea
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:17:50 +08:00 |
ZhangBiao
|
c8661ab384
|
【首领来袭】任务过小修改,
|
2021-03-17 16:17:41 +08:00 |
zhangqiang
|
38a6548a52
|
【充值】开服成长礼包道具太多,会重叠。
|
2021-03-17 16:15:55 +08:00 |
jiaoyangna
|
5963eb170b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:04:31 +08:00 |
ZhangBiao
|
b630889891
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:01:02 +08:00 |
ZhangBiao
|
17990d0dc8
|
【自选宝箱】修改
|
2021-03-17 16:00:52 +08:00 |
zhangqiang
|
125a393167
|
【修bug】
|
2021-03-17 15:54:45 +08:00 |
gaoxin
|
aa30b1ed6e
|
【bug】修复升级神将立即关闭界面,再次打开界面时显示错误
|
2021-03-17 15:29:23 +08:00 |
jiaoyangna
|
95351b5bd1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 15:03:54 +08:00 |
zhangqiang
|
7cc397c43f
|
【资源替换】技能新字替换
|
2021-03-17 14:58:54 +08:00 |
ZhangBiao
|
4efb36a195
|
【八日登陆】资源修改
|
2021-03-17 14:37:56 +08:00 |
jiaoyangna
|
ee30858c07
|
添加一个红点
|
2021-03-17 14:20:51 +08:00 |
jiaoyangna
|
909ed03c04
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 13:33:22 +08:00 |
ZhangBiao
|
bf3d732b69
|
【中文本地化】
|
2021-03-17 12:05:44 +08:00 |
jiaoyangna
|
32c239fcb2
|
活动开启条件提交
|
2021-03-17 12:02:32 +08:00 |
jiaoyangna
|
31b808209e
|
主界面修改提交
|
2021-03-17 11:55:02 +08:00 |
jiaoyangna
|
dfd3c4acc6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 11:54:40 +08:00 |
ZhangBiao
|
15dec90220
|
【本地化】修改
|
2021-03-17 11:29:43 +08:00 |
jiaoyangna
|
a7c5bcce1a
|
主界面修改提交
|
2021-03-17 11:07:47 +08:00 |
jiaoyangna
|
5d89fe2a79
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 10:38:11 +08:00 |
jiaoyangna
|
36f4efedc8
|
主城优化修改
|
2021-03-17 10:38:07 +08:00 |
gaoxin
|
15103f5032
|
【ios】引导战斗添加
|
2021-03-17 09:52:50 +08:00 |
gaoxin
|
232e7c158a
|
【优化】优化lateUpdate,修复使用lateupdate报错时会使所有lateupdate失效的问题
|
2021-03-17 09:52:17 +08:00 |
gaoxin
|
ef7130e056
|
修改首充界面错误
|
2021-03-16 18:29:25 +08:00 |
gaoxin
|
c8c81215ce
|
【图鉴】根据表配置控制显示隐藏
|
2021-03-16 18:06:57 +08:00 |
jiaoyangna
|
3fe1267e86
|
功能隐藏
(cherry picked from commit 2f2cf25801 )
|
2021-03-16 17:43:59 +08:00 |
jiaoyangna
|
8ec9b44626
|
功能不进版本隐藏按钮
(cherry picked from commit 0b538b6e1e )
|
2021-03-16 17:38:29 +08:00 |
ZhangBiao
|
e758730d4a
|
【首领来袭】
|
2021-03-16 17:25:11 +08:00 |
ZhangBiao
|
003d2e8ba5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-16 17:09:35 +08:00 |
ZhangBiao
|
c2cab749f4
|
【首领来袭】位置调整
|
2021-03-16 17:09:18 +08:00 |
JieLing
|
c945f53946
|
【修改bug】提交 竞技场 + 试炼奖励优化list重叠
|
2021-03-16 16:06:55 +08:00 |
ZhangBiao
|
6dda93f175
|
【国内测试】无法登录修复
|
2021-03-16 15:29:38 +08:00 |
ZhangBiao
|
4528e23541
|
Merge branch 'china/dev' into 0活动开发聚集地/限时神装
|
2021-03-16 14:49:47 +08:00 |
jiaoyangna
|
27859eec4f
|
灵兽羁绊修改提交
|
2021-03-16 11:10:09 +08:00 |
JieLing
|
7215433a87
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-16 10:30:37 +08:00 |
JieLing
|
ab8d5b8a2d
|
【国内先遣修改】
|
2021-03-16 10:25:41 +08:00 |
ZhangBiao
|
d82eb7f88a
|
【战斗开始过快修复】
|
2021-03-15 20:35:16 +08:00 |
ZhangBiao
|
95080d3da7
|
|
2021-03-15 18:38:26 +08:00 |
ZhangBiao
|
49701bcbec
|
【首领来袭】战斗报错修复
|
2021-03-15 18:37:16 +08:00 |
ZhangBiao
|
1b06ae40c9
|
【battlelogic】增加log
|
2021-03-15 17:11:52 +08:00 |
ZhangBiao
|
86fdb9395b
|
Merge branch '0功能/本周版本优化内容' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
|
2021-03-15 10:51:17 +08:00 |
ZhangBiao
|
9be337324a
|
【限时神装】完成
|
2021-03-15 10:37:26 +08:00 |
jiaoyangna
|
4e4dedec14
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-13 17:38:02 +08:00 |
jiaoyangna
|
f48ee539f6
|
修改提交
|
2021-03-13 17:37:59 +08:00 |
ZhangBiao
|
17a9550df8
|
【首领来袭】
|
2021-03-13 15:52:50 +08:00 |
ZhangBiao
|
37e948c9b9
|
【限时神装】
|
2021-03-13 15:09:34 +08:00 |