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 |
JieLing
|
6ac8b914d5
|
修复登录报错
|
2020-07-25 15:23:10 +08:00 |
jiaoyangna
|
6742056a93
|
冲突解决提交
|
2020-07-25 15:18:07 +08:00 |
JieLing
|
6807c6c1a6
|
meta文件提交
|
2020-07-25 15:15:16 +08:00 |
JieLing
|
cd43d2417f
|
内网测试 0.16.1
|
2020-07-25 15:13:59 +08:00 |
JieLing
|
2164aacc49
|
内网包配置修改
|
2020-07-25 14:52:41 +08:00 |
JieLing
|
89169b7291
|
资源文件名重复
|
2020-07-25 14:45:27 +08:00 |
JieLing
|
5896ecee63
|
Merge branch 'master_develop' into master_test
# Conflicts:
# Assets/LuaFramework/Scenes/Logo.unity
|
2020-07-25 14:31:52 +08:00 |
jiaoyangna
|
ea95537641
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 14:21:38 +08:00 |
jiaoyangna
|
a688050060
|
修改星星提交
|
2020-07-25 14:21:33 +08:00 |
shihongyi
|
ab7e0c022d
|
test
|
2020-07-25 14:06:55 +08:00 |
zhangqiang
|
f19188797f
|
英雄背景替换修改出发位置
|
2020-08-25 15:11:32 +08:00 |
zhangqiang
|
4117095996
|
一键上阵优化
|
2020-08-24 23:38:17 +08:00 |
jiaoyangna
|
5f556b7b5c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
|
2020-07-25 13:22:33 +08:00 |
jiaoyangna
|
0c2239bd11
|
编队修改提交
|
2020-07-25 13:21:30 +08:00 |
jiaoyangna
|
caadda04e1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab
|
2020-07-24 20:04:44 +08:00 |
jiaoyangna
|
064b819f4a
|
修改星星提交
|
2020-07-24 20:03:06 +08:00 |
shihongyi
|
5623050a01
|
变强屏蔽充值跳转、屏蔽巅峰商店
|
2020-07-24 19:20:13 +08:00 |
ZhangBiao
|
ae1d8b4e97
|
|
2020-07-24 18:49:17 +08:00 |
zhangqiang
|
a6744aaa90
|
替换英雄详情背景
|
2020-08-24 22:03:28 +08:00 |
zhangqiang
|
a11919fbd9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 21:46:33 +08:00 |
zhangqiang
|
abfde3e8a9
|
巅峰战bug and 使用按钮需求
|
2020-08-24 21:46:19 +08:00 |
skuld
|
f6415aa772
|
修改巅峰赛规则
|
2020-08-05 23:19:28 +08:00 |
ZhangBiao
|
b67269d2f7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 18:30:36 +08:00 |
ZhangBiao
|
4945f99452
|
--(24暂时关闭)
|
2020-07-24 18:30:26 +08:00 |
shihongyi
|
05f0d11729
|
巅峰战战斗回合、充值留特权商城
|
2020-07-24 17:15:30 +08:00 |
kansa
|
44b83f6fdd
|
修改圣物错误描述
|
2020-07-24 17:13:25 +08:00 |
ZhangBiao
|
f1755d0efa
|
--(24暂时关闭)
|
2020-07-24 16:52:36 +08:00 |
ZhangBiao
|
206c3d93a0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 16:39:15 +08:00 |