liujiaqi
|
68b9b28901
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 17:37:01 +08:00 |
liujiaqi
|
f9c686d56e
|
技能描述修改
|
2020-07-28 17:36:45 +08:00 |
gaoxin
|
0922b8f587
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 17:31:24 +08:00 |
gaoxin
|
a603520fdb
|
Merge branch '接入SDK' into master_develop
|
2020-07-28 17:30:59 +08:00 |
gaoxin
|
c9b4e71ab7
|
新aar资源替换
|
2020-07-28 17:30:06 +08:00 |
liujiaqi
|
ce3d5f8eda
|
技能描述修改
|
2020-07-28 17:28:53 +08:00 |
ZhangBiao
|
88effd78f1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 17:26:50 +08:00 |
ZhangBiao
|
6c316bf7de
|
|
2020-07-28 17:25:50 +08:00 |
gaoxin
|
2df9b068b9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 17:24:15 +08:00 |
gaoxin
|
fbff3d2a2a
|
删除音频文件导入时自动设置文件格式的问题
|
2020-07-28 17:20:25 +08:00 |
gaoxin
|
72921a8f51
|
修复行动时遭受异常状态死亡时会继续释放技能的问题
|
2020-07-28 17:19:57 +08:00 |
ZhangBiao
|
99e1c1d52a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 17:18:03 +08:00 |
ZhangBiao
|
1f474fd636
|
|
2020-07-28 17:17:55 +08:00 |
liujiaqi
|
b1e011e049
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 17:07:22 +08:00 |
liujiaqi
|
1ff4c353a6
|
bug礼包和入群礼包
|
2020-07-28 17:06:54 +08:00 |
shihongyi
|
4ea92473b9
|
bugfix
|
2020-07-28 17:06:37 +08:00 |
ZhangBiao
|
771826da9c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 17:01:58 +08:00 |
ZhangBiao
|
018adbe85d
|
天宫秘宝入口关闭,修改乾坤宝盒魂印弹窗
|
2020-07-28 17:01:48 +08:00 |
gaoxin
|
5d6586a9a5
|
部分界面适配修改
|
2020-07-28 17:00:19 +08:00 |
jiaoyangna
|
25d535fa4c
|
关闭特效
|
2020-07-28 16:57:12 +08:00 |
jiaoyangna
|
60bf046b81
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 16:54:43 +08:00 |
jiaoyangna
|
38a69a4017
|
编队添加特效
|
2020-07-28 16:54:38 +08:00 |
ZhangBiao
|
e2a8af9028
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 16:45:38 +08:00 |
zhangqiang
|
2a87d43fd0
|
bug
|
2020-07-31 17:36:06 +08:00 |
ZhangBiao
|
ddfbb25e2e
|
森罗bug修复
|
2020-07-28 16:45:28 +08:00 |
altair
|
701faa8360
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 16:38:57 +08:00 |
altair
|
f48b05e535
|
修改特效配置,挂机对话,帮助文字
|
2020-07-28 16:38:49 +08:00 |
gaoxin
|
5f6783fc13
|
新通用被击特效提交
|
2020-07-28 16:30:03 +08:00 |
kansa
|
29b60d30c4
|
修改大闹天空圣物掉落
|
2020-07-28 16:29:25 +08:00 |
gaoxin
|
e7e3de1674
|
引导打点不再传递日期
|
2020-07-28 16:12:29 +08:00 |
gaoxin
|
be57d5d44a
|
删除错误的spine
|
2020-07-28 16:11:04 +08:00 |
ZhangBiao
|
b4b24e62be
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 15:57:51 +08:00 |
ZhangBiao
|
a732396286
|
修复【乾坤宝】抽取获得的预览,可以操作装备出售
|
2020-07-28 15:57:36 +08:00 |
altair
|
f56f469940
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 15:48:31 +08:00 |
zhangqiang
|
a7d6db223a
|
war power change
|
2020-07-31 16:37:14 +08:00 |
altair
|
afc2fa5c86
|
修改道具图片
|
2020-07-28 15:48:23 +08:00 |
altair
|
9d5280d025
|
修改道具名称
|
2020-07-28 15:37:52 +08:00 |
shihongyi
|
fa241a43b2
|
限时通关首个钻石改10连、竞技场寻宝微调
|
2020-07-28 15:26:00 +08:00 |
ZhangBiao
|
1868a14b08
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 15:24:21 +08:00 |
ZhangBiao
|
52c34aa2a3
|
花费妖晶抽卡提示优化
|
2020-07-28 15:24:11 +08:00 |
jiaoyangna
|
119c4e4204
|
漏提
|
2020-07-28 15:16:04 +08:00 |
jiaoyangna
|
d5b15a17ee
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Common/functions.lua
|
2020-07-28 15:08:24 +08:00 |
zhangqiang
|
565d0392fc
|
背景颜色根据星级变化
|
2020-07-31 15:40:43 +08:00 |
zhangqiang
|
b63e9b7e81
|
英雄添加按战力排序
|
2020-07-31 14:45:32 +08:00 |
jiaoyangna
|
99f9e7169e
|
添加特效
|
2020-07-28 15:06:47 +08:00 |
ZhangBiao
|
146197b320
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 10:42:38 +08:00 |
ZhangBiao
|
ee79439f39
|
万象境 bug修复
|
2020-07-28 10:42:29 +08:00 |
gaoxin
|
48a39d2fae
|
游戏logo替换
|
2020-07-28 10:40:02 +08:00 |
szxhzz
|
2175be7bfc
|
配音更新
|
2020-07-28 10:25:46 +08:00 |
ZhangBiao
|
f26718899e
|
bug修复
|
2020-07-28 10:24:52 +08:00 |