Commit Graph

447 Commits (b31f0b52d1eb0a62942f804a2dce41cd6a3044d3)

Author SHA1 Message Date
liujiaqi b31f0b52d1 签到宝箱 2020-08-13 13:43:41 +08:00
altair 9d986d7c0b 修改道具图标及名称 2020-08-13 11:13:00 +08:00
altair b9b78ca37e 修改置换玉图标 2020-08-13 10:29:33 +08:00
liujiaqi 4e54d85fdc 技能选择目标回调 2020-08-13 10:14:39 +08:00
shihongyi dee104669b ##bug 2020-08-13 09:51:22 +08:00
liujiaqi c4938b7bd3 修正英雄主动技能,天赋,法宝,魂印描述增加标点 2020-08-12 20:42:57 +08:00
shihongyi 1de6a6bd83 bug、幻境 2020-08-12 20:41:22 +08:00
altair fde8f838a6 修改道具图标 2020-08-12 19:50:22 +08:00
shihongyi 60eb6d985d bugfix 2020-08-12 17:00:26 +08:00
lihaiyang af2d171298 合并添加轩辕宝境对应礼包 2020-08-12 14:33:12 +08:00
lihaiyang c3fe86af56 轩辕宝境添加对应道具 2020-08-12 14:30:42 +08:00
lihaiyang 27980e88e7 轩辕合并表格 轩辕宝境从四个变成一个 2020-08-12 14:27:19 +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
shihongyi 2d63f71ff5 分支合并手动解决冲突,待测 2020-08-12 14:13:50 +08:00
shihongyi e797e9f48d 合并develop &2 进程中,暂时不要更新 2020-08-12 11:37:26 +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
lihaiyang e443ecc249 轩辕 战斗次数修改类型 2020-08-11 18:37:44 +08:00
zhangqiang b67b99ad93 无尽副本临时新增入口 2020-08-11 16:31:17 +08:00
lihaiyang c5627194da 轩辕宝境问好内描述配置 2020-08-11 16:28:03 +08:00
lihaiyang fdf8cfdaa5 轩辕宝境 修改人物对应上阵数量 2020-08-11 16:26:52 +08:00
jiaoyangna 13e6f5cb19 Merge branch 'xuanyuanbaojing' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing 2020-08-11 15:11:39 +08:00
jiaoyangna 9f186311b3 xuanyuan 2020-08-11 15:11:33 +08:00
lihaiyang ed11c4f6b8 轩辕宝境问号 临时配置占格子 2020-08-11 14:54:12 +08:00
lihaiyang 28fba64cce 轩辕宝境 表合并 伤害强化提示配置 2020-08-11 14:51:47 +08:00
lihaiyang a2b989e3d8 轩辕宝境表合并 删除三个只剩下一个 2020-08-11 14:51:03 +08:00
lihaiyang 9bd1b05036 轩辕 增加特权礼包 2020-08-11 14:50:05 +08:00
lihaiyang 8ed6a3f80b 添加特权符 2020-08-11 14:49: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
lihaiyang 8ae6473de0 轩辕宝境 属性变化列 配置成buff 2020-08-10 19:13:30 +08:00
lihaiyang 15f073dbd1 轩辕宝境 伤害提升配置成buff id33增加 34 降低 2020-08-10 19:12:57 +08:00
skuld 916a6f7e25 合并置换玉消耗的ID的配置 2020-08-10 15:11:26 +08:00
skuld 7aac974925 添加新玩法帮助文字 2020-08-10 15:03:37 +08:00
shihongyi 686c7c468f 修改阵营属性权限、戒灵宝藏价格198 2020-08-10 14:25:56 +08:00
lihaiyang 42fc9bc3b1 轩辕 属性类型修改 2020-08-10 14:12:27 +08:00
lihaiyang 0e5e4827a0 挑战次数 删除计算用多余配置 2020-08-10 14:05:42 +08:00
lihaiyang ee2d5c96ce 轩辕新加字段首字母改为大写 2020-08-10 11:40:00 +08:00
skuld 107096bd96 添加置换玉消耗 2020-08-10 11:20:13 +08:00
zhangqiang 15722ee892 Merge branch '0功能/法宝归元和神将置换' into master_develop2 2020-08-10 11:01:46 +08:00
lihaiyang 3279cfd53f 轩辕添加编队,删除显示列调整到掉落表中,扫荡奖励,首次奖励各走各列 2020-08-10 10:56:25 +08:00
lihaiyang 6262e166bb 轩辕固定奖励配置到掉落组 2020-08-10 10:53:19 +08:00
lihaiyang f13731104b 轩辕 固定掉落配置到掉落表中 2020-08-10 10:51:32 +08:00
skuld 1ee836e1eb 置换玉道具ID 2020-08-10 10:41:57 +08:00
altair f9d334ed29 修改角色背景 2020-08-10 10:12:49 +08:00
zhangqiang 32c788b8ac 神将合成代码 2020-08-08 18:18:26 +08:00
lihaiyang e85c8b00c6 轩辕界面显示用 由掉落表id改为物品表id 2020-08-08 18:10:02 +08:00
lihaiyang 4658d6368e no message 2020-08-08 15:56:28 +08:00
zhangqiang 17b6db91e2 英雄合成提交部分代码 2020-08-08 15:51:55 +08:00
lihaiyang d13fbcf375 轩辕宝镜的礼包位置和礼包次数修改 2020-08-08 15:47:15 +08:00