Commit Graph

194 Commits (de99aed8a563fdfaf8d92f78c4e4de2241c967b6)

Author SHA1 Message Date
shihongyi de99aed8a5 充值表修改备注、献祭表id大小写、调整转盘奖励 2020-07-23 17:32:12 +08:00
ZhangBiao 7fb5ac778f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 15:44:51 +08:00
ZhangBiao 9b290c1ed5 图片资源替换 2020-07-23 15:44:40 +08:00
jiaoyangna 4af617da49 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 15:43:23 +08:00
altair a8c5d9b7d7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 15:29:11 +08:00
altair 9a58ce4eb1 修改提示文字 2020-07-23 15:29:04 +08:00
kansa a681ca2cfc 增加怪物天赋的升级成长,修改怪物属性 2020-07-23 14:18:15 +08:00
shihongyi fbc49bbaae 送神 2020-07-23 13:54:46 +08:00
altair 7fdcd31685 提示文字修改 2020-07-23 13:46:12 +08:00
altair c16a0d32d2 修改引导文字 2020-07-23 11:31:11 +08:00
altair ac27c34d6e 修改十绝阵详情 2020-07-23 11:27:13 +08:00
jiaoyangna cafa630185 Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2020-07-22 20:19:57 +08:00
shihongyi eb420274f6 大闹天宫困难模式开启战力、归元天宫编队提示 2020-07-22 19:11:07 +08:00
skuld c47500523a 修改日常副本文字描述 2020-07-22 15:29:10 +08:00
altair 508b6c284f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-22 14:53:14 +08:00
altair 56d356772b 修改推荐队伍角色名称 2020-07-22 14:53:06 +08:00
liujiaqi 5a6b495481 七日狂欢,6 7天奖励修改 2020-07-22 14:43:57 +08:00
skuld 804bca6284 添加宝物分解玩法规则 2020-07-22 10:51:38 +08:00
skuld c7bc3973e7 修改归元帮助文本 2020-07-22 10:46:55 +08:00
shihongyi 70c947b790 bugfix 2020-07-21 20:20:38 +08:00
shihongyi 07964515d9 怪物展示等级调整、限时兑换活动时长 2020-07-21 17:36:06 +08:00
liujiaqi b167354ff5 进阶提升属性修改 2020-07-21 17:00:01 +08:00
shihongyi a7494e7008 抽卡特权、超级月卡开启时间 2020-07-21 14:23:53 +08:00
jiaoyangna 03107d240a 轩辕宝镜提交 2020-07-21 10:42:20 +08:00
ZhangBiao 9ed616d8be 2020-07-21 09:38:34 +08:00
jiaoyangna 9b7e47aaef Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
#	data_execl/base_data/RaceTowerConfig.xlsx
2020-07-20 20:00:31 +08:00
kansa b7aaa633c9 增加轩辕宝境缺少的功能字段 2020-07-20 19:57:57 +08:00
jiaoyangna 04e9a24db0 xuanyuanmirror tijiao 2020-07-20 19:46:08 +08:00
shihongyi 6b007ddcfb 巅峰战奖励调整 2020-07-20 17:45:04 +08:00
shihongyi 89e7841b12 竞技场战斗阶段掉落内容 2020-07-20 17:16:09 +08:00
shihongyi 458c4dd054 斗法排行奖励调整 2020-07-20 17:02:16 +08:00
liujiaqi 5f0b1ae349 月礼包新增礼包8,新增神将升星自选箱,开服狂欢3日7日奖励更改 2020-07-20 16:32:03 +08:00
zhangqiang 99f885ac22 竞技场宝箱奖励位置可配 2020-07-20 16:01:16 +08:00
gongjiawei 4b946aa324 音頻跟新 2020-07-20 15:52:33 +08:00
shihongyi b9042bc782 置换卡池、魂印商店调整 2020-07-20 15:38:46 +08:00
liujiaqi 7f61f6317c 嫦娥共工大小调整 2020-07-20 14:31:59 +08:00
shihongyi e10ec6728f 调整部分成就前置 2020-07-20 10:28:08 +08:00
altair 734feeadf4 修改部分文字描述 2020-07-17 21:39:48 +08:00
kansa 994d90a086 修改商店bug 2020-07-17 21:21:22 +08:00
shihongyi b4ee8d9aea 首充5级 2020-07-17 21:04:09 +08:00
kansa 640df86d5c 增加轩辕宝境相关表,修改关联表,功能开发用 2020-07-17 18:43:47 +08:00
shihongyi c817c03411 竞技场累计次数奖励 2020-07-17 18:35:17 +08:00
liujiaqi f5dab0f98d 装备名修改 2020-07-17 18:19:12 +08:00
gongjiawei 3c6db51497 音频更新 2020-07-17 18:06:10 +08:00
shihongyi 2264a3a298 分离宝囊和限时抽卡特权及计数 2020-07-17 18:02:26 +08:00
altair 6d07756f4b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 17:29:48 +08:00
altair d4a1a2d5c5 修改配音配置 2020-07-17 17:29:41 +08:00
shihongyi 47bb773f6e bug 2020-07-17 17:01:17 +08:00
altair eb571c6ea9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 16:58:24 +08:00
altair 1b17159e96 删除错误配音及修改攻击音效 2020-07-17 16:58:16 +08:00