altair
|
82927d38c0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 20:39:36 +08:00 |
altair
|
9f5b75213e
|
修改特效配置
|
2020-07-25 20:39:20 +08:00 |
gaoxin
|
a8abedf426
|
本地服务器列表请求打印添加
|
2020-07-25 20:37:06 +08:00 |
jiaoyangna
|
24f9860235
|
close supreme
|
2020-07-25 20:35:32 +08:00 |
jiaoyangna
|
f4dc657551
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 20:28:46 +08:00 |
zhangqiang
|
bedfcdb4f6
|
车迟怪物显示
|
2020-09-13 21:56:49 +08:00 |
skuld
|
fcc1424cd5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 22:37:33 +08:00 |
skuld
|
7731aa45b8
|
修改猎妖之路为大闹天宫
|
2020-07-28 22:36:17 +08:00 |
jiaoyangna
|
46f091f09c
|
头像框修改提交
|
2020-07-25 20:28:41 +08:00 |
jiaoyangna
|
0ec835f540
|
获取头像框通用方法修改
|
2020-07-25 20:04:02 +08:00 |
jiaoyangna
|
48ff5b8b28
|
头像框通用方法修改
|
2020-07-25 20:02:24 +08:00 |
jiaoyangna
|
d8fa2b9459
|
头像背景修改
|
2020-07-25 19:59:43 +08:00 |
altair
|
3b26247c5d
|
修改图鉴图片
|
2020-07-25 19:47:49 +08:00 |
altair
|
2a356f4695
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 19:44:36 +08:00 |
altair
|
8afcc5fdf4
|
修改图鉴图片
|
2020-07-25 19:43:31 +08:00 |
gaoxin
|
7002d45fdc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 19:35:03 +08:00 |
gaoxin
|
c56a54665c
|
添加服务器版本号,用于切换提审服和正式服
|
2020-07-25 19:34:52 +08:00 |
jiaoyangna
|
57617faa49
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 19:32:02 +08:00 |
zhangqiang
|
3b11c5737a
|
空判断
|
2020-09-12 14:42:55 +08:00 |
jiaoyangna
|
f511cf3380
|
车迟斗法挑战提交
|
2020-07-25 19:31:55 +08:00 |
gaoxin
|
7d9a555151
|
修复被动225报错
|
2020-07-25 19:24:29 +08:00 |
gaoxin
|
381843a3db
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 18:53:39 +08:00 |
gaoxin
|
55fa5dda67
|
特效transform转rectTransform
|
2020-07-25 18:53:26 +08:00 |
altair
|
fcdf21e2bd
|
修改立绘错误
|
2020-07-25 18:51:08 +08:00 |
gaoxin
|
5d6543caee
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 18:37:27 +08:00 |
gaoxin
|
0a35d31531
|
关闭星成长礼拍脸
|
2020-07-25 18:37:19 +08:00 |
jiaoyangna
|
470a89d6f3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 18:35:54 +08:00 |
jiaoyangna
|
7c92ddc60a
|
副本置灰修改提交
|
2020-07-25 18:35:05 +08:00 |
altair
|
901442e847
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 18:34:38 +08:00 |
altair
|
b435345177
|
修改声效触发时机
|
2020-07-25 18:34:26 +08:00 |
gaoxin
|
98ef2bc8be
|
修复获取访客id报错
|
2020-07-25 18:31:06 +08:00 |
zhangqiang
|
789dc39efa
|
xiugaiyushe
|
2020-09-11 23:36:19 +08:00 |
gaoxin
|
2c2734ec2a
|
修复引导报错,修复本地测试时打点数据错误的问题
|
2020-07-25 18:10:05 +08:00 |
kansa
|
686ae9a826
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 18:07:35 +08:00 |
kansa
|
b4577b9718
|
修改竞技场机器人库,使其匹配大闹天宫
|
2020-07-25 18:07:13 +08:00 |
zhangqiang
|
a077692c0f
|
关卡编队修改
|
2020-09-11 23:07:45 +08:00 |
shihongyi
|
7028de188e
|
bug
|
2020-07-25 18:02:58 +08:00 |
altair
|
71438e88c3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 17:39:34 +08:00 |
altair
|
8281ce1733
|
添加缺失效果
|
2020-07-25 17:38:52 +08:00 |
jiaoyangna
|
58702c0025
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 17:24:25 +08:00 |
jiaoyangna
|
e4525199d8
|
开启乾坤宝囊和限时召唤
|
2020-07-25 17:24:19 +08:00 |
gaoxin
|
f34fb2280e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 17:17:43 +08:00 |
gaoxin
|
28a74e529b
|
打点事件修改
|
2020-07-25 17:17:34 +08:00 |
shihongyi
|
671441d305
|
巅峰时间、充值屏蔽
|
2020-07-25 17:16:58 +08:00 |
gaoxin
|
0cca48270d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 17:09:06 +08:00 |
gaoxin
|
2947a10e03
|
引导打点添加,打点account字段改为字符串类型
|
2020-07-25 17:08:56 +08:00 |
jiaoyangna
|
8bc87ca492
|
按钮位置不对提交
|
2020-07-25 17:08:20 +08:00 |
zhangqiang
|
a24c1e2016
|
暂时屏蔽加一种道具
|
2020-09-11 21:53:12 +08:00 |
gaoxin
|
3ef98155b5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 16:25:23 +08:00 |
zhangqiang
|
a65257a740
|
剑影仙踪去掉拍脸
|
2020-09-11 21:37:17 +08:00 |