altair
|
a8c5d9b7d7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 15:29:11 +08:00 |
altair
|
9a58ce4eb1
|
修改提示文字
|
2020-07-23 15:29:04 +08:00 |
wangzhenxing
|
60b7e750a6
|
【ID1007274】
【技能】无敌盾应清除目标所有负面状态
|
2020-07-23 16:19:00 +09:00 |
jiaoyangna
|
578d81e12e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2020-07-23 16:07:43 +08:00 |
jiaoyangna
|
561c3299f2
|
.asset commit
|
2020-07-23 16:05:56 +08:00 |
jiaoyangna
|
2fd0311c3c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Audio/Skill/skill/Audio_c_xy_0012_skeff_tapsk_healeff.mp3.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2020-07-23 16:02:06 +08:00 |
jiaoyangna
|
b424927bbb
|
tupian tijiao
|
2020-07-23 16:01:26 +08:00 |
zhangqiang
|
3b3dbec6a7
|
添加巅峰赛编队
|
2020-07-23 14:36:28 +08:00 |
kansa
|
a681ca2cfc
|
增加怪物天赋的升级成长,修改怪物属性
|
2020-07-23 14:18:15 +08:00 |
ZhangBiao
|
be3464221d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 13:56:15 +08:00 |
ZhangBiao
|
c7da3db86d
|
大闹天宫打完boss不加积分问题修复
|
2020-07-23 13:55:12 +08:00 |
shihongyi
|
fbc49bbaae
|
送神
|
2020-07-23 13:54:46 +08:00 |
altair
|
7fdcd31685
|
提示文字修改
|
2020-07-23 13:46:12 +08:00 |
gaoxin
|
3cf3cf7e90
|
特效旋转功能添加
|
2020-07-23 13:44:03 +08:00 |
ZhangBiao
|
6f35ad19c2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 12:47:22 +08:00 |
ZhangBiao
|
207dd8e2ec
|
天宫秘宝刷新时间修改
|
2020-07-23 12:46:48 +08:00 |
zhangqiang
|
9bb7008a6d
|
淘汰赛战斗 可以观看多场记录
|
2020-07-23 12:19:45 +08:00 |
ZhangBiao
|
6e81d30a5d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 11:20:25 +08:00 |
ZhangBiao
|
e266292288
|
关卡掉落装备显示问题修复
|
2020-07-23 11:19:27 +08:00 |
zhangqiang
|
b53907dda2
|
Merge branch 'master_develop' into master_arena
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2020-07-23 11:10:19 +08:00 |
zhangqiang
|
db4ffb1e95
|
提交
|
2020-07-23 11:08:11 +08:00 |
wangzhenxing
|
228d2da247
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 11:34:22 +09:00 |
altair
|
c16a0d32d2
|
修改引导文字
|
2020-07-23 11:31:11 +08:00 |
altair
|
04c7858a91
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 11:27:22 +08:00 |
altair
|
ac27c34d6e
|
修改十绝阵详情
|
2020-07-23 11:27:13 +08:00 |
wangzhenxing
|
e12c485c99
|
添加225效果及 添加减乘运算
|
2020-07-23 11:34:08 +09:00 |
gaoxin
|
87b221b621
|
新技能特效添加
|
2020-07-23 10:23:33 +08:00 |
JieLing
|
346a1a5f6f
|
Merge branch 'master_test' into master_develop
|
2020-07-22 22:21:29 +08:00 |
JieLing
|
13fd2b45a5
|
一些相关配置文件提交
|
2020-07-22 22:21:18 +08:00 |
JieLing
|
256954f620
|
sdk修改
|
2020-07-22 22:12:20 +08:00 |
zhangqiang
|
f844305e0e
|
Merge branch 'master_develop' into master_arena
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
|
2020-07-22 21:55:01 +08:00 |
gaoxin
|
d6561a8c07
|
先后手协议添加
|
2020-07-22 21:39:45 +08:00 |
gaoxin
|
aa16826682
|
战斗先后手功能添加
|
2020-07-22 21:24:42 +08:00 |
jiaoyangna
|
cafa630185
|
Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2020-07-22 20:19:57 +08:00 |
zhangqiang
|
0b747a5179
|
竞猜币提交
|
2020-07-22 19:40:23 +08:00 |
shihongyi
|
eb420274f6
|
大闹天宫困难模式开启战力、归元天宫编队提示
|
2020-07-22 19:11:07 +08:00 |
jiaoyangna
|
35012ad758
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-22 19:07:34 +08:00 |
jiaoyangna
|
f8abe77d82
|
归元时检测大闹天宫队伍的神将
|
2020-07-22 19:07:29 +08:00 |
szxhzz
|
61a841abae
|
音频提交
|
2020-07-22 18:35:53 +08:00 |
ZhangBiao
|
b444d31f17
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-22 17:29:03 +08:00 |
ZhangBiao
|
10bb654c40
|
十绝阵红点刷新修复
|
2020-07-22 17:28:34 +08:00 |
jiaoyangna
|
2ecf69827f
|
归元修改提交
|
2020-07-22 16:31:31 +08:00 |
jiaoyangna
|
be357f9268
|
【归元】三星卡不在归元列表显示,不能对三星的归元
|
2020-07-22 16:25:10 +08:00 |
jiaoyangna
|
404a0ffedb
|
归元报错修改
|
2020-07-22 16:13:25 +08:00 |
jiaoyangna
|
69f61467a2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-22 15:57:01 +08:00 |
jiaoyangna
|
ba8b5a3c93
|
【宝物合成】一键合成预览处显示错误
|
2020-07-22 15:50:18 +08:00 |
skuld
|
c47500523a
|
修改日常副本文字描述
|
2020-07-22 15:29:10 +08:00 |
altair
|
508b6c284f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-22 14:53:14 +08:00 |
altair
|
56d356772b
|
修改推荐队伍角色名称
|
2020-07-22 14:53:06 +08:00 |
gaoxin
|
560b366938
|
添加前置特效转向的效果
|
2020-07-22 14:49:32 +08:00 |