Commit Graph

464 Commits (8e438f9d20e4b704b81bb83f94a7e1e1a3e56aa4)

Author SHA1 Message Date
lihaiyang 8e438f9d20 开启时间修正
周一开启妖灵宝境;
周二开启佛禅宝境;
周三开启人杰宝境;
周四开启道玄宝境;
周五开启妖灵宝境和人杰宝境;
周六开启佛禅宝境和道玄宝境;
周日开启所有四种宝境。
2020-08-14 17:11:58 +08:00
shihongyi 768ea83f23 塔战力 2020-08-14 14:09:04 +08:00
liujiaqi 8366d5d54e 大小经验金币包矿镐,矿镐包,一键购买 2020-08-14 11:16:18 +08:00
shihongyi acd9da4f15 暂时开启云梦祈福 2020-08-14 10:46:55 +08:00
lihaiyang 95d6d13f25 轩辕全天开启 英文名字重复 2020-08-14 09:40:52 +08:00
lihaiyang ce7f4b2790 修改轩辕宝境怪物属性 2020-08-13 21:54:58 +08:00
altair 47f8542201 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 20:59:17 +08:00
altair 5edfd6548e 修改传记错误 2020-08-13 20:59:07 +08:00
shihongyi deeedf7aea 塔怪1 2020-08-13 20:55:47 +08:00
shihongyi 93a20786cb 限时兑换 2020-08-13 20:39:55 +08:00
shihongyi bae1143471 剑影仙踪拍脸等级、兑换活动控制 2020-08-13 16:53:07 +08:00
skuld 451a279458 添加轩辕宝境入口描述文字 2020-08-13 15:47:12 +08:00
lihaiyang 76e7b5d406 轩辕宝境怪物属性初版 2020-08-13 15:38:53 +08:00
lihaiyang 8702f62d1f 轩辕宝境开启等级修改为75级 2020-08-13 15:35:05 +08:00
lihaiyang b918f8c06b 轩辕免费次数和购买次数位置修改 2020-08-13 15:33:32 +08:00
jiaoyangna beaaeed139 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 14:21:50 +08:00
lihaiyang 9a75e685ac 轩辕宝境邮件配合 2020-08-13 14:21:28 +08:00
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