jiaoyangna
|
cafa630185
|
Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2020-07-22 20:19:57 +08:00 |
shihongyi
|
eb420274f6
|
大闹天宫困难模式开启战力、归元天宫编队提示
|
2020-07-22 19:11:07 +08:00 |
jiaoyangna
|
35012ad758
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-22 19:07:34 +08:00 |
jiaoyangna
|
f8abe77d82
|
归元时检测大闹天宫队伍的神将
|
2020-07-22 19:07:29 +08:00 |
szxhzz
|
61a841abae
|
音频提交
|
2020-07-22 18:35:53 +08:00 |
ZhangBiao
|
b444d31f17
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-22 17:29:03 +08:00 |
ZhangBiao
|
10bb654c40
|
十绝阵红点刷新修复
|
2020-07-22 17:28:34 +08:00 |
jiaoyangna
|
2ecf69827f
|
归元修改提交
|
2020-07-22 16:31:31 +08:00 |
jiaoyangna
|
be357f9268
|
【归元】三星卡不在归元列表显示,不能对三星的归元
|
2020-07-22 16:25:10 +08:00 |
jiaoyangna
|
404a0ffedb
|
归元报错修改
|
2020-07-22 16:13:25 +08:00 |
jiaoyangna
|
69f61467a2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-22 15:57:01 +08:00 |
jiaoyangna
|
ba8b5a3c93
|
【宝物合成】一键合成预览处显示错误
|
2020-07-22 15:50:18 +08:00 |
skuld
|
c47500523a
|
修改日常副本文字描述
|
2020-07-22 15:29:10 +08:00 |
altair
|
508b6c284f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-22 14:53:14 +08:00 |
altair
|
56d356772b
|
修改推荐队伍角色名称
|
2020-07-22 14:53:06 +08:00 |
liujiaqi
|
5a6b495481
|
七日狂欢,6 7天奖励修改
|
2020-07-22 14:43:57 +08:00 |
ZhangBiao
|
f1ab5780e4
|
切换界面黑屏问题解决
|
2020-07-22 14:34:00 +08:00 |
ZhangBiao
|
16357bb4e4
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-22 10:51:46 +08:00 |
skuld
|
804bca6284
|
添加宝物分解玩法规则
|
2020-07-22 10:51:38 +08:00 |
ZhangBiao
|
176ab5f359
|
|
2020-07-22 10:51:36 +08:00 |
skuld
|
c7bc3973e7
|
修改归元帮助文本
|
2020-07-22 10:46:55 +08:00 |
ZhangBiao
|
2d79cc70e5
|
【战斗】解锁倍速提示,VIP改成特权
|
2020-07-22 10:33:31 +08:00 |
ZhangBiao
|
38ee63365c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-21 20:20:51 +08:00 |
ZhangBiao
|
934b6e8bb0
|
新章节未开启,奖励与地图已经更改问题修改
|
2020-07-21 20:20:39 +08:00 |
shihongyi
|
70c947b790
|
bugfix
|
2020-07-21 20:20:38 +08:00 |
gaoxin
|
7f5296ea9e
|
删除无用文件夹
|
2020-07-21 19:27:43 +08:00 |
shihongyi
|
07964515d9
|
怪物展示等级调整、限时兑换活动时长
|
2020-07-21 17:36:06 +08:00 |
liujiaqi
|
b167354ff5
|
进阶提升属性修改
|
2020-07-21 17:00:01 +08:00 |
gongjiawei
|
05496217f7
|
音频更新
|
2020-07-21 16:06:07 +08:00 |
ZhangBiao
|
8ff8920d84
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-21 16:04:18 +08:00 |
ZhangBiao
|
ae502e8322
|
bug修复
|
2020-07-21 16:04:07 +08:00 |
szxhzz
|
127d675497
|
音频更新
|
2020-07-21 15:39:06 +08:00 |
szxhzz
|
78634d7e04
|
音频更新
|
2020-07-21 15:05:11 +08:00 |
ZhangBiao
|
a07830ea52
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-21 14:36:54 +08:00 |
ZhangBiao
|
9f9f430976
|
道具标签不对应修改
|
2020-07-21 14:36:15 +08:00 |
gongjiawei
|
f9854d57e6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-21 14:25:07 +08:00 |
gongjiawei
|
781a1e8453
|
音频更新
|
2020-07-21 14:24:57 +08:00 |
shihongyi
|
a7494e7008
|
抽卡特权、超级月卡开启时间
|
2020-07-21 14:23:53 +08:00 |
jiaoyangna
|
49d65fe9db
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-21 14:16:46 +08:00 |
jiaoyangna
|
9fbcc3b77b
|
【神将】升星,需要四个三星同阵营不应该自动给选择上
|
2020-07-21 14:16:40 +08:00 |
gaoxin
|
70149e951d
|
version文件回滚
|
2020-07-21 14:10:49 +08:00 |
gaoxin
|
528243e0ee
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-21 14:09:52 +08:00 |
ZhangBiao
|
3503afa84b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-21 12:01:53 +08:00 |
ZhangBiao
|
8ca0ecab40
|
|
2020-07-21 12:01:46 +08:00 |
gongjiawei
|
1eae262785
|
音频更新
|
2020-07-21 11:41:45 +08:00 |
gaoxin
|
0992012713
|
Merge branch 'master_test' into master_develop
|
2020-07-21 11:40:13 +08:00 |
gaoxin
|
f5ed76daa1
|
Merge branch 'master_test' of http://60.1.1.230/gaoxin/JL_Client into master_test
|
2020-07-21 11:32:58 +08:00 |
gaoxin
|
0db4c93ef7
|
修复登录界面登出事件无法触发的问题
|
2020-07-21 11:31:26 +08:00 |
jiaoyangna
|
aa86f77fea
|
【充值】表里配的5级,实际创角就有入口
|
2020-07-21 11:31:05 +08:00 |
jiaoyangna
|
03107d240a
|
轩辕宝镜提交
|
2020-07-21 10:42:20 +08:00 |