Commit Graph

80 Commits (18f5055d200c239734e992d79319c12c1c228b09)

Author SHA1 Message Date
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