zhangqiang
|
17b6db91e2
|
英雄合成提交部分代码
|
2020-08-08 15:51:55 +08:00 |
zhangqiang
|
6dd95ec834
|
神将合成部分显示代码
|
2020-08-08 11:06:01 +08:00 |
zhangqiang
|
f2d743a343
|
英雄合成预设更新
|
2020-08-07 14:23:05 +08:00 |
ZhangBiao
|
f09a0448bc
|
|
2020-08-07 10:34:18 +08:00 |
zhangqiang
|
93e1d880c8
|
英雄合成界面拼接
|
2020-08-06 18:34:04 +08:00 |
ZhangBiao
|
ed373d1851
|
Merge branch '0功能/法宝归元和神将置换' of http://60.1.1.230/gaoxin/JL_Client into 0功能/法宝归元和神将置换
|
2020-08-06 10:43:28 +08:00 |
ZhangBiao
|
44497f73bd
|
神将置换页面制作1
|
2020-08-06 10:43:11 +08:00 |
zhangqiang
|
3bb0906865
|
法宝归元中文表
|
2020-08-06 10:38:55 +08:00 |
shihongyi
|
b617c30639
|
置换及合成qa
|
2020-08-06 09:43:22 +08:00 |
ZhangBiao
|
eeaa1f26f8
|
|
2020-08-05 19:18:15 +08:00 |
zhangqiang
|
0a37b3cb11
|
法宝回归协议提交
|
2020-08-07 12:41:35 +08:00 |
ZhangBiao
|
a1b9ca69f6
|
Merge branch '0功能/法宝归元和神将置换' of http://60.1.1.230/gaoxin/JL_Client into 0功能/法宝归元和神将置换
|
2020-08-05 17:16:30 +08:00 |
zhangqiang
|
4533695a3d
|
法宝归元界面提交
|
2020-08-07 12:22:10 +08:00 |
ZhangBiao
|
d72d87d497
|
|
2020-08-05 17:16:06 +08:00 |
ZhangBiao
|
203514d85f
|
神将置换入口添加
|
2020-08-05 16:30:02 +08:00 |
ZhangBiao
|
ee19d26bd3
|
神将置换界面创建
|
2020-08-05 15:36:22 +08:00 |
ZhangBiao
|
6f0c40707e
|
置换界面
|
2020-08-05 14:10:46 +08:00 |
zhangqiang
|
ed53f7e760
|
Merge branch 'master_develop' into master_develop2
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# data_execl/base_data/BeStronger.xlsx
# data_execl/base_data/EquipTalismana.xlsx
# data_execl/base_data/GlobalActivity.xlsx
|
2020-08-07 06:54:04 +08:00 |
shihongyi
|
1e55175acb
|
限时抽活动时间
|
2020-08-05 10:59:36 +08:00 |
zhangqiang
|
54148395b4
|
日常副本判断开启临时添加战力计算
|
2020-08-07 06:06:55 +08:00 |
jiaoyangna
|
dd4800f657
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 20:49:48 +08:00 |
jiaoyangna
|
1b7f35e41f
|
bg update
|
2020-08-04 20:49:42 +08:00 |
ZhangBiao
|
989703a0e4
|
乾坤宝盒单抽bug修复、四元阵赠送“元神玉”
|
2020-08-04 20:30:26 +08:00 |
ZhangBiao
|
6acaa8549d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 20:23:16 +08:00 |
ZhangBiao
|
ee28c18254
|
森罗bug修复
|
2020-08-04 20:22:56 +08:00 |
jiaoyangna
|
802286d743
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 18:41:22 +08:00 |
jiaoyangna
|
e9438df1b7
|
图鉴优化
|
2020-08-04 18:41:17 +08:00 |
zhangqiang
|
e45e6c9325
|
公会技能升级优化
|
2020-08-04 18:37:30 +08:00 |
liujiaqi
|
9fd25a6c98
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 18:24:09 +08:00 |
liujiaqi
|
6fb9b33978
|
新增挂机地图
|
2020-08-04 18:22:11 +08:00 |
ZhangBiao
|
7255baef99
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 18:19:38 +08:00 |
ZhangBiao
|
f548b53b46
|
开引导 在森罗杀进程 重新登陆后 不回到森罗
|
2020-08-04 18:19:20 +08:00 |
kansa
|
2ceb319c5f
|
新增挂机背景图1
|
2020-08-04 17:57:39 +08:00 |
gongjiawei
|
4c0c01cefe
|
音频更新
|
2020-08-04 17:47:38 +08:00 |
kansa
|
de8f04b9bc
|
修改十绝阵怪物预览的显示星级
|
2020-08-04 17:25:24 +08:00 |
zhangqiang
|
7b73f4ae77
|
升星成功界面加天赋解锁显示
|
2020-08-04 17:24:15 +08:00 |
liujiaqi
|
9823834bcf
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 16:26:06 +08:00 |
liujiaqi
|
cf8c32c645
|
我要变强点将神符换元神符描述修改,妈祖庇佑改为神女庇佑魂印
|
2020-08-04 16:25:52 +08:00 |
ZhangBiao
|
ade7ee88bc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 16:19:06 +08:00 |
ZhangBiao
|
24381aba57
|
森罗bug修复
|
2020-08-04 16:18:48 +08:00 |
zhangqiang
|
e11b5fd7bb
|
寻宝红点修改 添加解锁新章节音效
|
2020-08-04 15:33:44 +08:00 |
gongjiawei
|
15494b2117
|
音频更新
|
2020-08-04 14:33:15 +08:00 |
kansa
|
c0730e64a3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 14:12:44 +08:00 |
liujiaqi
|
ba64ab34ff
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 14:12:32 +08:00 |
kansa
|
8b47a37eb3
|
推迟森罗幻境刷新时间
|
2020-08-04 14:12:12 +08:00 |
liujiaqi
|
b4cdaaafe4
|
累冲448档碎片奖励修正签到碎片奖励修正
|
2020-08-04 14:12:09 +08:00 |
zhangqiang
|
0a8bdc5765
|
援助 十绝阵 合成 提示性bug
|
2020-08-04 14:02:28 +08:00 |
shihongyi
|
28e158032e
|
统一 5星碎片只商店
|
2020-08-04 11:58:16 +08:00 |
gongjiawei
|
52e0c553f7
|
音频更新
|
2020-08-04 11:13:08 +08:00 |
liujiaqi
|
10dc26b855
|
开服狂欢第七日全民超值大小礼包调换位置
|
2020-08-04 11:11:18 +08:00 |