gaoxin
|
48fc5c61fb
|
取消背景音乐加速
|
2020-07-13 18:01:58 +08:00 |
gaoxin
|
a4ffc54ba0
|
Merge branch '音效修改' into master_develop
|
2020-07-13 17:53:51 +08:00 |
gaoxin
|
a37151646a
|
战斗音效播放速度随战斗速度变化
|
2020-07-13 17:53:15 +08:00 |
altair
|
09ca881967
|
修改配音配置
|
2020-07-13 17:49:24 +08:00 |
jiaoyangna
|
4f959f8f9f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 17:32:49 +08:00 |
jiaoyangna
|
889d3abf68
|
【送神祠】归元,点敖丙报错
|
2020-07-13 17:32:24 +08:00 |
shihongyi
|
adaa54830d
|
归元
|
2020-07-13 17:24:30 +08:00 |
jiaoyangna
|
d2f25e1845
|
归元修改
|
2020-07-13 17:12:46 +08:00 |
liujiaqi
|
07f2d763e6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 16:52:35 +08:00 |
liujiaqi
|
11add2dd81
|
乾坤魂印兑换图标资源
|
2020-07-13 16:52:16 +08:00 |
gaoxin
|
240818a620
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 16:49:11 +08:00 |
gaoxin
|
db1118aa9c
|
修复打包后不能充值得bug
|
2020-07-13 16:48:50 +08:00 |
jiaoyangna
|
ff2e9aaaa3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 16:47:28 +08:00 |
jiaoyangna
|
d16ecd259a
|
【公会】公会成员信息点开报错
|
2020-07-13 16:46:59 +08:00 |
ZhangBiao
|
1645736a5c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 16:41:50 +08:00 |
ZhangBiao
|
416ba72c2f
|
森罗小游戏bug修改
|
2020-07-13 16:41:35 +08:00 |
shihongyi
|
4678a7e6ed
|
vipbugfix
|
2020-07-13 16:40:59 +08:00 |
jiaoyangna
|
f80ac29435
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 16:23:01 +08:00 |
jiaoyangna
|
b2c9b88991
|
【装备】在成员信息界面,点击主线编队内的神将信息,穿戴的装备可以分解
|
2020-07-13 16:16:56 +08:00 |
shihongyi
|
f21a74ba75
|
归元、精炼宝物消耗
|
2020-07-13 16:06:06 +08:00 |
zhangqiang
|
a1ae3f6cb3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 15:42:39 +08:00 |
zhangqiang
|
bc270de90d
|
提交
|
2020-07-13 15:39:29 +08:00 |
liujiaqi
|
1e50ce286d
|
技能生效范围和七日登录描述
|
2020-07-13 15:28:17 +08:00 |
kansa
|
1e2d9e646e
|
修改森罗幻境buff随机库
|
2020-07-13 15:20:19 +08:00 |
zhangqiang
|
926ff911da
|
一键上阵修改
|
2020-07-13 15:08:32 +08:00 |
jiaoyangna
|
3953a76280
|
【宝物】一键装备替下来的,不在背包显示
|
2020-07-13 15:00:07 +08:00 |
jiaoyangna
|
0ae50e09be
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 12:01:47 +08:00 |
jiaoyangna
|
40fa614a52
|
限时召唤】点十连,单抽的免费不显示了
|
2020-07-13 12:01:39 +08:00 |
shihongyi
|
af24467d74
|
转盘积分箱内容丢失bugfix
|
2020-07-13 11:45:24 +08:00 |
jiaoyangna
|
fb8a020790
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 11:16:03 +08:00 |
jiaoyangna
|
6ff6b5315b
|
分解、重置相关功能修改
|
2020-07-13 11:15:53 +08:00 |
shihongyi
|
053e8f6daa
|
调整通关奖励
|
2020-07-13 10:47:08 +08:00 |
gaoxin
|
58cc4bc0c3
|
部分字段改为前后端读取
|
2020-07-11 18:04:39 +08:00 |
gaoxin
|
717e09168b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-11 18:03:56 +08:00 |
gaoxin
|
8d25e6f9b2
|
修复VIP引导报错
|
2020-07-11 18:03:27 +08:00 |
jiaoyangna
|
f654f744a6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-11 18:00:16 +08:00 |
jiaoyangna
|
fdf82e47ac
|
分解、重置相关功能修改
|
2020-07-11 18:00:07 +08:00 |
altair
|
c43233121f
|
修改传记文字
|
2020-07-11 17:17:13 +08:00 |
altair
|
45d89d395b
|
修改技能配置
|
2020-07-11 16:49:07 +08:00 |
altair
|
079e7acbb2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-11 16:27:12 +08:00 |
altair
|
5686fb219d
|
增加配音配置
|
2020-07-11 16:26:03 +08:00 |
jiaoyangna
|
106a7f7763
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
|
2020-07-11 16:25:30 +08:00 |
jiaoyangna
|
0fb81547d3
|
分解提交
|
2020-07-11 16:21:15 +08:00 |
gaoxin
|
f96f07865f
|
meta文件提交
|
2020-07-11 15:45:39 +08:00 |
gaoxin
|
5c1e235228
|
技能名称音效添加
|
2020-07-11 15:42:56 +08:00 |
gaoxin
|
27f46f4572
|
添加技能音效列
|
2020-07-11 15:22:03 +08:00 |
gaoxin
|
ee0c035731
|
技能音效添加
|
2020-07-11 15:19:49 +08:00 |
ZhangBiao
|
310802e967
|
language导出
|
2020-07-10 19:13:29 +08:00 |
ZhangBiao
|
7279a7edd1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-10 19:03:03 +08:00 |
ZhangBiao
|
3ab971eaea
|
宝囊红点
|
2020-07-10 19:02:54 +08:00 |