liujiaqi
|
4e54d85fdc
|
技能选择目标回调
|
2020-08-13 10:14:39 +08:00 |
shihongyi
|
dee104669b
|
##bug
|
2020-08-13 09:51:22 +08:00 |
jiaoyangna
|
937d46ff75
|
xuanyuan commit
|
2020-08-12 21:10:47 +08:00 |
jiaoyangna
|
a9ebd162ec
|
轩辕 提交
|
2020-08-12 21:10:36 +08:00 |
jiaoyangna
|
39fb3d113c
|
xuyuan commit
|
2020-08-12 21:10:27 +08:00 |
zhangqiang
|
783583404e
|
神将合成修改提交
|
2020-08-12 20:59:20 +08:00 |
liujiaqi
|
c4938b7bd3
|
修正英雄主动技能,天赋,法宝,魂印描述增加标点
|
2020-08-12 20:42:57 +08:00 |
shihongyi
|
1de6a6bd83
|
bug、幻境
|
2020-08-12 20:41:22 +08:00 |
altair
|
4a60554eab
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-12 19:50:33 +08:00 |
altair
|
fde8f838a6
|
修改道具图标
|
2020-08-12 19:50:22 +08:00 |
zhangqiang
|
058b18bc6f
|
最新表 协议数据
|
2020-08-12 18:29:11 +08:00 |
gongjiawei
|
0d0ae17a68
|
音频更新
|
2020-08-12 18:11:39 +08:00 |
gongjiawei
|
a5663aae42
|
音频更新
|
2020-08-12 17:53:48 +08:00 |
ZhangBiao
|
0931365a3d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-12 17:03:49 +08:00 |
ZhangBiao
|
5304368d56
|
神将置换 上阵英雄不可以置换调整
(cherry picked from commit 0b5a3539ab6fe191b7e1497f32e2e6d3285e21ef)
|
2020-08-12 17:03:39 +08:00 |
shihongyi
|
60eb6d985d
|
bugfix
|
2020-08-12 17:00:26 +08:00 |
gongjiawei
|
b4e8c6803c
|
音频更新
|
2020-08-12 16:02:35 +08:00 |
gaoxin
|
809e10df79
|
Merge branch 'master_develop2' into master_develop
|
2020-08-12 14:45:01 +08:00 |
jiaoyangna
|
755565d9bd
|
Merge branch 'xuanyuanbaojing' into master_develop2
|
2020-08-12 14:44:22 +08:00 |
lihaiyang
|
af2d171298
|
合并添加轩辕宝境对应礼包
|
2020-08-12 14:33:12 +08:00 |
lihaiyang
|
d6485a1d78
|
Merge branch 'xuanyuanbaojing' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing
|
2020-08-12 14:31:14 +08:00 |
jiaoyangna
|
8c27eecbf6
|
xuanyuan update
|
2020-08-12 14:30:55 +08:00 |
lihaiyang
|
c3fe86af56
|
轩辕宝境添加对应道具
|
2020-08-12 14:30:42 +08:00 |
jiaoyangna
|
0573c0dd4f
|
Merge branch 'xuanyuanbaojing' into master_develop2
|
2020-08-12 14:30:24 +08:00 |
jiaoyangna
|
2de73b3eb1
|
轩辕 update
|
2020-08-12 14:29:06 +08:00 |
lihaiyang
|
27980e88e7
|
轩辕合并表格 轩辕宝境从四个变成一个
|
2020-08-12 14:27:19 +08:00 |
jiaoyangna
|
d5c241208d
|
merge
|
2020-08-12 14:25:36 +08:00 |
gaoxin
|
4e639d2401
|
Merge branch 'master_develop2' into master_develop
|
2020-08-12 14:22:29 +08:00 |
jiaoyangna
|
95dff6f0e9
|
Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2020-08-12 14:20:45 +08:00 |
jiaoyangna
|
96d47d34a8
|
Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua
# data_execl/base_data/GlobalSystemConfig.xlsx
# data_execl/base_data/ItemConfig.xlsx
# data_execl/base_data/RechargeCommodityConfig.xlsx
|
2020-08-12 14:17:01 +08:00 |
ZhangBiao
|
06bc9c1f1d
|
Merge branch '0功能/法宝归元和神将置换' into master_develop2
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2020-08-12 14:15:27 +08:00 |
shihongyi
|
2d63f71ff5
|
分支合并手动解决冲突,待测
|
2020-08-12 14:13:50 +08:00 |
jiaoyangna
|
7bee1280b3
|
xuanyuan update
|
2020-08-12 14:13:28 +08:00 |
ZhangBiao
|
ed319be87e
|
神将置换
|
2020-08-12 14:13:16 +08:00 |
jiaoyangna
|
e372c84cdb
|
xuanyuan
|
2020-08-12 13:34:07 +08:00 |
jl_ios
|
8be4e2745b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-12 12:43:03 +08:00 |
jl_ios
|
14645cb184
|
iOS 打包修复无法生成luabytes文件的问题
|
2020-08-12 11:58:12 +08:00 |
shihongyi
|
e797e9f48d
|
合并develop &2 进程中,暂时不要更新
|
2020-08-12 11:37:26 +08:00 |
gongjiawei
|
8133bd8e62
|
音频更新
|
2020-08-12 11:18:44 +08:00 |
gongjiawei
|
572f6c156b
|
音频更新
|
2020-08-12 11:12:10 +08:00 |
shihongyi
|
4c81a5110e
|
进阶升星属性
|
2020-08-12 10:56:41 +08:00 |
altair
|
c269e053d5
|
修改宝魂图标
|
2020-08-12 10:46:54 +08:00 |
altair
|
254181112d
|
修改道具图标
|
2020-08-12 10:27:04 +08:00 |
wangzhenxing
|
6d274b7991
|
【ID1008763】
【技能】124 释放技能后回复己方后排[a]点怒气 (目标不正确,给双方后排加怒)
|
2020-08-12 10:24:02 +09:00 |
ZhangBiao
|
c1c013a007
|
神将置换 基本功能完成
|
2020-08-11 20:55:05 +08:00 |
lihaiyang
|
926a33eb47
|
Merge branch 'xuanyuanbaojing' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing
|
2020-08-11 19:10:57 +08:00 |
gongjiawei
|
45fd69256e
|
音频更新
|
2020-08-11 18:38:02 +08:00 |
lihaiyang
|
e443ecc249
|
轩辕 战斗次数修改类型
|
2020-08-11 18:37:44 +08:00 |
jiaoyangna
|
4b6c60d2ca
|
Merge branch 'xuanyuanbaojing' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing
|
2020-08-11 17:11:07 +08:00 |
jiaoyangna
|
b43d36109c
|
log
|
2020-08-11 17:10:12 +08:00 |