jiaoyangna
|
48ff5b8b28
|
头像框通用方法修改
|
2020-07-25 20:02:24 +08:00 |
jiaoyangna
|
d8fa2b9459
|
头像背景修改
|
2020-07-25 19:59:43 +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 |
gaoxin
|
65756cbe59
|
Merge branch 'master_local_test' into master_develop
# Conflicts:
# Assets/Effect.meta
# Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_02.prefab.meta
# Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_03.prefab.meta
# Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ddtz_00049_001_01.prefab.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua.meta
# Assets/ManagedResources/~Lua/Modules/MapChoose.meta
|
2020-07-25 16:24:48 +08:00 |
JieLing
|
543a4ca080
|
修复提交数据报错,内网测试0.16.2
|
2020-07-25 16:23:04 +08:00 |
gaoxin
|
528cd49109
|
Merge branch 'master_local_test' into master_develop
|
2020-07-25 16:21:30 +08:00 |
gaoxin
|
2b7eb6bf2a
|
Merge branch '英雄技能特效添加' into master_develop
# Conflicts:
# Assets/Effect/Prefab.meta
# Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_01.prefab.meta
# Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua.meta
|
2020-07-25 16:13:55 +08:00 |
altair
|
773448d96c
|
修改特效
|
2020-07-25 16:11:10 +08:00 |
gaoxin
|
99315ac3c6
|
首充引导关闭
|
2020-07-25 16:05:27 +08:00 |
gaoxin
|
761745dc63
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 16:02:50 +08:00 |
zhangqiang
|
fe01796ded
|
修改
|
2020-09-11 21:10:39 +08:00 |
gaoxin
|
0b62abdb72
|
修复左右黑边的问题
|
2020-07-25 16:02:38 +08:00 |
jiaoyangna
|
50e50475be
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 15:46:48 +08:00 |
gaoxin
|
e6b0cbcf3e
|
无用meta文件删除
|
2020-07-25 15:31:11 +08:00 |
gaoxin
|
7c47d7c6a4
|
攻击音效提前0.3秒
|
2020-07-25 15:30:33 +08:00 |
zhangqiang
|
1845d662ab
|
巅峰战竞猜结果新加界面 新手引导修改主线开始战斗按钮名称
|
2020-09-07 21:15:40 +08:00 |