jiaoyangna
|
481c818ffa
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 17:43:30 +08:00 |
jiaoyangna
|
84f82d488d
|
live2d commit
|
2020-08-14 17:43:24 +08:00 |
jiaoyangna
|
0b157b6ee8
|
轩辕宝镜入口替换
|
2020-08-14 16:09:00 +08:00 |
wangzhenxing
|
e139a43f65
|
屏蔽金翅大鹏不死效果
|
2020-08-14 16:50:32 +09:00 |
jiaoyangna
|
4604df2d0b
|
修改轩辕副本立绘
|
2020-08-14 14:36:24 +08:00 |
jiaoyangna
|
40b9550c54
|
修改轩辕副本立绘提交
|
2020-08-14 14:35:48 +08:00 |
jiaoyangna
|
1f7b161087
|
五星成长礼修改提交
|
2020-08-14 13:32:55 +08:00 |
jiaoyangna
|
905d77b0c6
|
Merge branches 'master_develop' and 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 13:01:17 +08:00 |
jiaoyangna
|
c9c3cb2fa4
|
operatingmanager commit
|
2020-08-14 13:01:12 +08:00 |
ZhangBiao
|
7a1e1599d8
|
|
2020-08-14 10:14:53 +08:00 |
ZhangBiao
|
416d6eb16c
|
每日签到
|
2020-08-13 22:30:09 +08:00 |
ZhangBiao
|
e655562a71
|
|
2020-08-13 17:07:05 +08:00 |
ZhangBiao
|
9bac8e2bfc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 16:38:57 +08:00 |
ZhangBiao
|
e397fa88e7
|
|
2020-08-13 16:38:40 +08:00 |
wangzhenxing
|
442877d3e0
|
珍奇宝阁预设代码提交
|
2020-08-13 16:38:20 +09:00 |
jiaoyangna
|
fbf7c3b41d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 14:44:53 +08:00 |
jiaoyangna
|
b2f5dbc2ca
|
xuanyuan update
|
2020-08-13 14:43:44 +08:00 |
ZhangBiao
|
dd3c814c2a
|
四元阵中 添加 置换入口
|
2020-08-13 14:43:10 +08:00 |
ZhangBiao
|
2fe27c64ec
|
|
2020-08-13 12:33:21 +08:00 |
ZhangBiao
|
a6d69bd001
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 12:00:38 +08:00 |
ZhangBiao
|
f4dad25b7a
|
神将置换bug修复
|
2020-08-13 12:00:18 +08:00 |
gaoxin
|
de27163861
|
合成修改
|
2020-08-13 11:46:55 +08:00 |
gaoxin
|
b4eef8c285
|
神将合成显示修改
|
2020-08-13 11:11:26 +08:00 |
gaoxin
|
48d8f3887b
|
修改神将合成显示问题
|
2020-08-13 10:28:16 +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 |
zhangqiang
|
058b18bc6f
|
最新表 协议数据
|
2020-08-12 18:29:11 +08:00 |
ZhangBiao
|
5304368d56
|
神将置换 上阵英雄不可以置换调整
(cherry picked from commit 0b5a3539ab6fe191b7e1497f32e2e6d3285e21ef)
|
2020-08-12 17:03:39 +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 |
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 |
shihongyi
|
e797e9f48d
|
合并develop &2 进程中,暂时不要更新
|
2020-08-12 11:37:26 +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 |
zhangqiang
|
b67b99ad93
|
无尽副本临时新增入口
|
2020-08-11 16:31:17 +08:00 |
jiaoyangna
|
9f186311b3
|
xuanyuan
|
2020-08-11 15:11:33 +08:00 |
jiaoyangna
|
f7fe1d9513
|
Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# data_execl/base_data/GlobalActivity.xlsx
# data_execl/base_data/GlobalSystemConfig.xlsx
# data_execl/base_data/ItemConfig.xlsx
# data_execl/base_data/RechargeCommodityConfig.xlsx
# data_execl/base_data/SpecialConfig.xlsx
|
2020-08-11 14:07:10 +08:00 |
jiaoyangna
|
16e1699e65
|
no message
|
2020-08-11 11:58:41 +08:00 |
jiaoyangna
|
179632ca21
|
no message
|
2020-08-11 11:56:03 +08:00 |
jiaoyangna
|
6f05841519
|
no message
|
2020-08-11 11:00:30 +08:00 |
wangzhenxing
|
109bcc49f6
|
张强对魂印增加属性修改
|
2020-08-11 11:24:22 +09:00 |
jiaoyangna
|
dc058f99e1
|
no message
|
2020-08-11 10:13:50 +08:00 |
jiaoyangna
|
3d2f288934
|
轩辕宝镜提交
|
2020-08-11 09:48:21 +08:00 |
zhangqiang
|
176f9d4c47
|
合成bug
|
2020-08-10 16:17:13 +08:00 |
wangzhenxing
|
7953575074
|
角色身上如果有无敌盾不会扣出怒气
|
2020-08-10 15:50:28 +09:00 |