jiaoyangna
|
1fcdf5b2a6
|
【皮肤】添加皮肤属性加成
|
2020-11-03 19:37:05 +08:00 |
jiaoyangna
|
d040e4dded
|
神将界面结构修改
|
2020-11-03 15:17:48 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
zhangqiang
|
0a5816a4ec
|
线上问题工会技能战力修改
|
2020-10-26 14:47:14 +08:00 |
zhangqiang
|
b6f48c4910
|
线上战力 属性取整问题
|
2020-10-26 14:46:43 +08:00 |
gaoxin
|
119be29c7d
|
【角色】修复角色被动技能数量计算错误,兼容多合一被动
|
2020-11-30 21:17:56 +08:00 |
zhangqiang
|
2f31dad427
|
线上问题 vip 战力计算打开 只是表的 pvp 评分配成0
|
2020-10-12 14:48:22 +08:00 |
gaoxin
|
77b3855221
|
如果宝物被分解了,重复穿戴检测会报错
|
2020-10-10 10:35:49 +08:00 |
gaoxin
|
9ff73bfa4c
|
添加重复穿戴的宝器的处理,重复穿戴的自动卸下,并自动穿戴在战斗力最大的人身上
|
2020-10-09 21:46:03 +08:00 |
jiaoyangna
|
fd2f210c5b
|
【ID1010112】【魂印】在大闹天宫中招募神将后,神将身上的魂印会显示在玩家装备魂印时的列表中
|
2020-09-29 11:30:52 +08:00 |
zhangqiang
|
46a9536c19
|
线上 : 战力计算 注释 VIP属性加成
|
2020-09-27 19:16:33 +08:00 |
JieLing
|
e9159cc1ca
|
修复大闹天宫招募带有宝物的英雄会导致登陆卡死的问题,针对装备丢失添加判空操作避免登陆卡死
|
2020-09-27 15:09:28 +08:00 |
zhangqiang
|
fc97424538
|
线上问题 : 一键编队上阵了归元后战力低的英雄
|
2020-09-22 17:33:37 +08:00 |
zhangqiang
|
6b55198f12
|
周月礼包替图
|
2020-09-04 18:35:30 +08:00 |
jiaoyangna
|
ce839831d7
|
【提示优化】修改处于多个编队的神将作为进阶材料、以及进行神将置换时的文字提示
|
2020-09-03 10:55:16 +08:00 |
ZhangBiao
|
40266d1120
|
删除一些log、修复升级豪礼红点bug
|
2020-08-31 16:32:27 +08:00 |
zhangqiang
|
946aaa36ea
|
处理神将归元 无尽和大闹天宫一级上阵问题 神将置换大闹天宫编队没血量问题
|
2020-08-31 15:54:12 +08:00 |
jiaoyangna
|
8e5e508494
|
置换 commit
|
2020-08-28 00:09:07 +08:00 |
jiaoyangna
|
80f59d54f1
|
置换编队检测还原
|
2020-08-27 22:23:04 +08:00 |
jiaoyangna
|
f2f3b77260
|
biandui update
|
2020-08-27 21:29:03 +08:00 |
jiaoyangna
|
f25bdb2d17
|
神将置换去掉检测编队
|
2020-08-27 21:17:47 +08:00 |
jiaoyangna
|
283ffca275
|
神将置换不检测无尽副本
|
2020-08-27 21:01:05 +08:00 |
jiaoyangna
|
3961935716
|
【神将置换】在大闹天宫编队中不需要提示已上阵,可以直接操作置换
|
2020-08-27 20:45:27 +08:00 |
zhangqiang
|
fe3ff00677
|
增加魂印战力
|
2020-08-27 15:21:08 +08:00 |
zhangqiang
|
a2bd473d75
|
再次修改工会技能升级
|
2020-08-29 16:23:31 +08:00 |
zhangqiang
|
220a8f216e
|
大闹天宫背景 大闹天宫女例会比例 公会技能更新战力调整位置
|
2020-08-29 16:15:41 +08:00 |
zhangqiang
|
6dec0b0307
|
修改公会技能升级 更新英雄战力
|
2020-08-26 20:56:28 +08:00 |
zhangqiang
|
86361419cc
|
神将合成bug
|
2020-08-26 19:44:29 +08:00 |
zhangqiang
|
64802afd2b
|
巅峰战编队提示bug提交
|
2020-08-26 15:47:01 +08:00 |
zhangqiang
|
384b3b35c3
|
编队修改
|
2020-08-26 15:00:13 +08:00 |
zhangqiang
|
060cc081bb
|
修改bug
|
2020-08-25 17:50:52 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
jiaoyangna
|
f05c6094b5
|
恭送英雄宝物修改提交
|
2020-08-24 16:08:03 +08:00 |
jiaoyangna
|
056815a8b6
|
patch commit
|
2020-08-22 19:40:14 +08:00 |
ZhangBiao
|
b0f0b654ec
|
无尽副本已经可以进去了
(cherry picked from commit a1737d6e7014963b19c97ccfb2d1c878d88bc295)
|
2020-08-18 10:48:52 +08:00 |
zhangqiang
|
6df142b067
|
修改bug 分解吞宝器 宝器穿的不显示属性 婚姻副本跳转 宝器合成背景隐藏
|
2020-08-17 11:39:41 +08:00 |
ZhangBiao
|
f4dad25b7a
|
神将置换bug修复
|
2020-08-13 12:00:18 +08:00 |
zhangqiang
|
783583404e
|
神将合成修改提交
|
2020-08-12 20:59:20 +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 |
ZhangBiao
|
ed319be87e
|
神将置换
|
2020-08-12 14:13:16 +08:00 |
shihongyi
|
e797e9f48d
|
合并develop &2 进程中,暂时不要更新
|
2020-08-12 11:37:26 +08:00 |
ZhangBiao
|
c1c013a007
|
神将置换 基本功能完成
|
2020-08-11 20:55:05 +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 |
wangzhenxing
|
109bcc49f6
|
张强对魂印增加属性修改
|
2020-08-11 11:24:22 +09:00 |
zhangqiang
|
3937426101
|
神将合成提交
|
2020-08-10 10:56:17 +08:00 |
zhangqiang
|
17b6db91e2
|
英雄合成提交部分代码
|
2020-08-08 15:51:55 +08:00 |
zhangqiang
|
f2d743a343
|
英雄合成预设更新
|
2020-08-07 14:23:05 +08:00 |
zhangqiang
|
93e1d880c8
|
英雄合成界面拼接
|
2020-08-06 18:34:04 +08:00 |
jiaoyangna
|
16d4b6477d
|
no message
|
2020-08-06 17:37:07 +08:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
zhangqiang
|
4533695a3d
|
法宝归元界面提交
|
2020-08-07 12:22:10 +08:00 |
ZhangBiao
|
434aaeccff
|
魂印特效 无用log删除
|
2020-08-03 15:20:18 +08:00 |
jiaoyangna
|
4ab47f9a01
|
resolve hero commit
|
2020-08-03 10:31:43 +08:00 |
zhangqiang
|
2a87d43fd0
|
bug
|
2020-07-31 17:36:06 +08:00 |
zhangqiang
|
a7d6db223a
|
war power change
|
2020-07-31 16:37:14 +08:00 |
zhangqiang
|
b63e9b7e81
|
英雄添加按战力排序
|
2020-07-31 14:45:32 +08:00 |
zhangqiang
|
3b11c5737a
|
空判断
|
2020-09-12 14:42:55 +08:00 |
ZhangBiao
|
b3ddd8fc96
|
|
2020-07-24 15:22:17 +08:00 |
ZhangBiao
|
f27300721a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 12:14:52 +08:00 |
ZhangBiao
|
1f5440c2e6
|
bug修复
|
2020-07-24 12:11:00 +08:00 |
jiaoyangna
|
667b3e0bf5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 10:32:45 +08:00 |
jiaoyangna
|
15976637f4
|
log提交
|
2020-07-24 10:32:27 +08:00 |
zhangqiang
|
3588a17c00
|
Merge branch 'master_develop' into master_arena
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
# data_execl/base_data/UIConfig.xlsx
|
2020-07-23 21:24:00 +08:00 |
jiaoyangna
|
5894babbf0
|
英雄献祭修改提交
|
2020-07-23 16:26:51 +08:00 |
zhangqiang
|
3b3dbec6a7
|
添加巅峰赛编队
|
2020-07-23 14:36:28 +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 |
wangzhenxing
|
e12c485c99
|
添加225效果及 添加减乘运算
|
2020-07-23 11:34:08 +09: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 |
ZhangBiao
|
ae502e8322
|
bug修复
|
2020-07-21 16:04:07 +08:00 |
jiaoyangna
|
adc3b71e40
|
分解修改提交
|
2020-07-16 10:49:01 +08:00 |
zhangqiang
|
592d3385e8
|
129 战力计算
|
2020-07-14 14:49:15 +08:00 |
jiaoyangna
|
0b26bb33c6
|
归元修改
|
2020-07-13 18:31:39 +08:00 |
jiaoyangna
|
889d3abf68
|
【送神祠】归元,点敖丙报错
|
2020-07-13 17:32:24 +08:00 |
jiaoyangna
|
d2f25e1845
|
归元修改
|
2020-07-13 17:12:46 +08:00 |
zhangqiang
|
bc270de90d
|
提交
|
2020-07-13 15:39:29 +08:00 |
jiaoyangna
|
6ff6b5315b
|
分解、重置相关功能修改
|
2020-07-13 11:15:53 +08:00 |
jiaoyangna
|
fdf82e47ac
|
分解、重置相关功能修改
|
2020-07-11 18:00:07 +08:00 |
ZhangBiao
|
310802e967
|
language导出
|
2020-07-10 19:13:29 +08:00 |
jiaoyangna
|
3a85c6e339
|
分解,限时召唤提交
|
2020-07-10 18:29:38 +08:00 |
jiaoyangna
|
7f54e3c88a
|
装备提交
|
2020-07-06 20:35:39 +08:00 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +08:00 |
JieLing
|
7382b2db77
|
版本开发提交
|
2020-06-28 17:52:29 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
e189462ac9
|
内网测试 0.15.14
|
2020-06-18 20:39:29 +08:00 |
JieLing
|
cf5f3e9952
|
内网测试 0.15.12
|
2020-06-13 11:47:13 +08:00 |
JieLing
|
59db757cf9
|
六月三号开发提交
|
2020-06-03 19:09:01 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +08:00 |
JieLing
|
266b9065d8
|
测试版本 带热更 0.15.1
|
2020-05-15 16:52:35 +08:00 |
JieLing
|
00892194b5
|
提交
|
2020-05-11 09:38:52 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |