Commit Graph

541 Commits (994d2602845afe8d9202a1f7a758f0a3ed454527)

Author SHA1 Message Date
lihaiyang 4b30dd9c7c 特权轩辕宝境挑战次数配置 2020-08-05 19:46:13 +08:00
lihaiyang 6411b30ca3 轩辕宝境配置表上传 2020-08-05 19:45:31 +08:00
lihaiyang ed28a60ac1 轩辕宝境·奖励配置 2020-08-05 19:43:50 +08:00
lihaiyang 9f2087e9ea 轩辕开始时间(星期) 2020-08-05 19:42:57 +08:00
shihongyi 89510e36f1 巅峰赛引导误填bug 2020-08-05 17:55:15 +08:00
ZhangBiao 203514d85f 神将置换入口添加 2020-08-05 16:30:02 +08:00
shihongyi 2f78b8c2e3 阵营抽保底 2020-08-05 15:47:04 +08:00
shihongyi 0caa56d2a9 置换功能 2020-08-05 15:38:20 +08:00
zhangqiang ed53f7e760 Merge branch 'master_develop' into master_develop2
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	data_execl/base_data/BeStronger.xlsx
#	data_execl/base_data/EquipTalismana.xlsx
#	data_execl/base_data/GlobalActivity.xlsx
2020-08-07 06:54:04 +08:00
shihongyi 1502f8ec1b 转盘金币产出下调 2020-08-05 15:32:04 +08:00
ZhangBiao 6f0c40707e 置换界面 2020-08-05 14:10:46 +08:00
shihongyi 73f79d1193 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-05 13:57:56 +08:00
gaoxin 519a24eb2c 修复引导合成碎片时点击速度太快导致引导错误的问题 2020-08-05 13:55:03 +08:00
shihongyi ac3f0e8df3 限时抽时间 2020-08-05 13:51:47 +08:00
shihongyi 1e55175acb 限时抽活动时间 2020-08-05 10:59:36 +08:00
ZhangBiao 989703a0e4 乾坤宝盒单抽bug修复、四元阵赠送“元神玉” 2020-08-04 20:30:26 +08:00
liujiaqi 6fb9b33978 新增挂机地图 2020-08-04 18:22:11 +08:00
kansa 2ceb319c5f 新增挂机背景图1 2020-08-04 17:57:39 +08:00
gongjiawei 4c0c01cefe 音频更新 2020-08-04 17:47:38 +08:00
kansa de8f04b9bc 修改十绝阵怪物预览的显示星级 2020-08-04 17:25:24 +08:00
zhangqiang 7b73f4ae77 升星成功界面加天赋解锁显示 2020-08-04 17:24:15 +08:00
liujiaqi cf8c32c645 我要变强点将神符换元神符描述修改,妈祖庇佑改为神女庇佑魂印 2020-08-04 16:25:52 +08:00
gongjiawei 15494b2117 音频更新 2020-08-04 14:33:15 +08:00
kansa c0730e64a3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-04 14:12:44 +08:00
liujiaqi ba64ab34ff Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-04 14:12:32 +08:00
kansa 8b47a37eb3 推迟森罗幻境刷新时间 2020-08-04 14:12:12 +08:00
liujiaqi b4cdaaafe4 累冲448档碎片奖励修正签到碎片奖励修正 2020-08-04 14:12:09 +08:00
zhangqiang 0a8bdc5765 援助 十绝阵 合成 提示性bug 2020-08-04 14:02:28 +08:00
shihongyi 28e158032e 统一 5星碎片只商店 2020-08-04 11:58:16 +08:00
liujiaqi 10dc26b855 开服狂欢第七日全民超值大小礼包调换位置 2020-08-04 11:11:18 +08:00
shihongyi de441aa61d 补充 环境 101~200 怪 2020-08-03 19:22:49 +08:00
liujiaqi b0a624aaff 孔雀明王、净光天女、幽魂姬主动技能描述修正,
孔雀明王、东陵圣母、杨戬、金翅大鹏、蚩尤天赋描述修正
治疗机制修改为治疗生命百分比最低单位
姜子牙6星激活特性属性修正,吕洞宾4阶突破天赋属性修正,孟婆4阶突破天赋属性修正,夜叉8星激活天赋属性修正,阎罗王8星激活属性天赋修正,水德星君2阶突破天赋属性修正,聚宝盆圣物描述修正
142107 150105 151109 146105 152109 10070102被动技能属性修正
2020-08-03 17:54:36 +08:00
altair c47507f128 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 19:40:07 +08:00
altair 991fb91fca 修改法宝名称及图标 2020-07-31 19:39:58 +08:00
gongjiawei 7590410807 音频更新 2020-07-31 17:58:25 +08:00
shihongyi e25f297c89 法宝末级不填消耗以计算满级 2020-07-31 17:17:55 +08:00
altair 00d93db9a0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 16:43:53 +08:00
altair 10f2b6b5d0 修改道具名称 2020-07-31 16:43:44 +08:00
skuld 3f5fdf3ec1 修改大闹天宫BOSS名字 2020-07-31 16:42:35 +08:00
skuld 85c64ecb85 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 16:27:39 +08:00
skuld 23173aee60 修改大闹天宫的敌人节点形象和缩放 2020-07-31 16:27:28 +08:00
shihongyi 3c73e2480c 屏蔽掉的充值内容找回之1 2020-07-31 16:18:12 +08:00
altair f21effe024 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 15:10:58 +08:00
altair 9631ef5425 修改技能描述 2020-07-31 15:10:48 +08:00
kansa 1859513d3b 修改车迟斗法怪物id错误导致的bug 2020-07-31 15:00:14 +08:00
altair 3b32ac2645 增加降龙罗汉特效 2020-07-31 13:31:07 +08:00
altair 80eb12321b 修改姜子牙特效 2020-07-30 19:29:12 +08:00
gongjiawei 3d0c82e4b0 音频更新 2020-07-30 17:51:17 +08:00
altair 153c2b986b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 14:43:01 +08:00
altair bc213b95b3 增加雷震子特效 2020-07-30 14:42:48 +08:00
kansa b154b2a873 删除多余的vip特权显示 2020-07-30 14:37:03 +08:00
liujiaqi 348d58260f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 14:36:02 +08:00
liujiaqi f811464f17 姑获鸟被动技能修正 2020-07-30 14:35:39 +08:00
skuld 0ee18e9a20 修改商店的帮助文本 2020-07-30 14:29:45 +08:00
shihongyi 544ced56b7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 10:59:39 +08:00
shihongyi 0b4ed8e5d8 修改天宫商店QA 为友情商店内容的bug 2020-07-30 10:58:49 +08:00
altair 6b88e994e1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 10:58:27 +08:00
altair 2ece05ff7e 修改推荐队伍配置 2020-07-30 10:58:18 +08:00
shihongyi 3687d855f6 极速次数临时调整为3次 2020-07-30 10:56:04 +08:00
shihongyi a98f298a14 81116 宝箱 bug 2020-07-30 10:20:40 +08:00
lihaiyang bca23e2cd3 挨个对比查验全部表格 2020-07-29 21:39:14 +08:00
liujiaqi 4df8a00031 吴刚被动修正 2020-07-29 21:09:43 +08:00
lihaiyang 8e34523865 修改第三天全服狂欢 折扣奖励价格 2020-07-29 20:18:11 +08:00
shihongyi 68e130bd50 探宝礼包描述bug 2020-07-29 20:10:57 +08:00
liujiaqi 3fd67ed10d 预览战斗修改 2020-07-29 17:54:45 +08:00
altair d7fb50a6d6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 17:17:25 +08:00
altair ade2d10899 增加标注 2020-07-29 17:17:10 +08:00
kansa d8e08b5c44 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 17:05:53 +08:00
kansa 348cf2a3d3 修改车迟斗法boss形象和boss战斗中位置 2020-07-29 17:05:25 +08:00
liujiaqi 05dae1a326 我要变强,优化 2020-07-29 17:05:09 +08:00
lihaiyang 4b71bd7221 修改杂货商店蓝色碎片价格 2020-07-29 16:58:35 +08:00
shihongyi f142563b1d 秘宝商店标签名字 2020-07-29 16:51:41 +08:00
lihaiyang f282abb694 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 16:20:26 +08:00
zhangqiang b2a54634d2 适配调整 巅峰赛入口 2020-08-15 00:08:25 +08:00
lihaiyang 11a550cb5e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 16:11:52 +08:00
lihaiyang 015305d4fc 元神商店去掉打折,价格不变,已测试 2020-07-29 16:11:14 +08:00
shihongyi 5b094f2d84 去除仙缘抽限制的100充值门槛 2020-07-29 16:01:59 +08:00
kansa ed75ba814b 修改关卡怪物系别错误 2020-07-29 14:45:57 +08:00
wangyuan f5e6c90487 排查了一下打折相关所有的价值 比例不正确的进行了一下微调 2020-07-29 13:59:31 +08:00
kansa 829ab2e608 修改错误 2020-07-29 12:41:10 +08:00
kansa 183d8c1a74 修改车迟斗法怪物属性 2020-07-29 12:40:16 +08:00
wangyuan ff5b2f6ecb 工会商店去掉折扣展示 2020-07-29 12:13:19 +08:00
wangyuan 3acfcab88f 道具商店折扣修改 2020-07-29 11:39:24 +08:00
wangyuan c0d8db5253 仙尘商店去掉折扣 寻宝图和普通抽奖的价格修改 2020-07-29 11:31:48 +08:00
ZhangBiao 2731d973fb 删除跳过按钮的首充提示 2020-07-29 02:32:07 +08:00
altair f81db7ac81 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 23:06:10 +08:00
altair 7e7b873e31 修改播放时机 2020-07-28 23:06:03 +08:00
kansa b462d8056e 修改限时招募和乾坤包囊活动时间 2020-07-28 22:32:47 +08:00
wangyuan 7c7fabc3d0 修改商店物品价格 2020-07-28 21:35:26 +08:00
wangyuan b2c515de97 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 21:15:31 +08:00
liujiaqi a6a9575b98 1152技能描述 2020-07-28 21:12:39 +08:00
wangyuan 9ca5a21a96 妖魂魔符换成幸运探宝券和置换玉换成九转金丹 所有道具对应价格表 配置成打折道具 2020-07-28 20:52:40 +08:00
kansa 77a7c52ca1 修改活动持续时间 2020-07-28 20:27:17 +08:00
altair 6f1932faaa 修改道具描述 2020-07-28 20:24:49 +08:00
altair 30aed85812 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 20:09:49 +08:00
altair 42740e5e19 修改指引文字 2020-07-28 20:09:39 +08:00
szxhzz b0c0bf5da0 配置表更新 2020-07-28 19:08:28 +08:00
altair 05486c779b 修改帮助文字 2020-07-28 17:55:44 +08:00
altair fff72e4047 修改图片 2020-07-28 17:53:50 +08:00
altair 4b9a9d27d2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	data_execl/base_data/ItemConfig.xlsx
2020-07-28 17:50:18 +08:00
altair 2168db33a3 修改道具图片 2020-07-28 17:43:02 +08:00
liujiaqi f9c686d56e 技能描述修改 2020-07-28 17:36:45 +08:00
liujiaqi ce3d5f8eda 技能描述修改 2020-07-28 17:28:53 +08:00
liujiaqi b1e011e049 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:07:22 +08:00
liujiaqi 1ff4c353a6 bug礼包和入群礼包 2020-07-28 17:06:54 +08:00
shihongyi 4ea92473b9 bugfix 2020-07-28 17:06:37 +08:00
zhangqiang 2a87d43fd0 bug 2020-07-31 17:36:06 +08:00
altair 701faa8360 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 16:38:57 +08:00
altair f48b05e535 修改特效配置,挂机对话,帮助文字 2020-07-28 16:38:49 +08:00
kansa 29b60d30c4 修改大闹天空圣物掉落 2020-07-28 16:29:25 +08:00
altair afc2fa5c86 修改道具图片 2020-07-28 15:48:23 +08:00
altair 9d5280d025 修改道具名称 2020-07-28 15:37:52 +08:00
shihongyi fa241a43b2 限时通关首个钻石改10连、竞技场寻宝微调 2020-07-28 15:26:00 +08:00
ZhangBiao cec1f145b6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 09:48:26 +08:00
ZhangBiao 48ac527f1a 限时召唤 乾坤宝盒 页面整合 2020-07-28 09:48:02 +08:00
altair aff5c002a9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	data_execl/base_data/CombatControl.xlsx
2020-07-27 21:04:51 +08:00
altair 66f2e2860d 修改特效及文字表 2020-07-27 20:05:26 +08:00
gaoxin c25fc7e39d bulletTime字段权限修改 2020-07-27 19:45:37 +08:00
shihongyi 854c359043 献祭、归元、吃掉返还调整 2020-07-27 18:23:37 +08:00
altair 3f490c64b9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 18:13:06 +08:00
altair 5d08c6832a 修改受击特效 2020-07-27 18:09:38 +08:00
shihongyi 178b3054b7 道具商城 2020-07-27 17:00:52 +08:00
liujiaqi 807d6745ac 描述调整 2020-07-27 16:17:02 +08:00
skuld 974f5a1fd5 添加活动开启时间和描述 2020-07-27 15:54:02 +08:00
altair 57c748b960 修改挂机文字 2020-07-27 11:22:09 +08:00
kansa 2fa696094a 修改竞技场引导战斗用机器人 2020-07-27 09:59:28 +08:00
altair 7692325864 修改图标 2020-07-25 23:07:54 +08:00
altair ddd0aff41c 修改图片配置 2020-07-25 22:50:29 +08:00
altair 51c5aa453a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 20:47:28 +08:00
altair 039e831582 修改图标 2020-07-25 20:47:20 +08:00
gaoxin 1ce7c0db2f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 20:42:20 +08:00
gaoxin b0002cf781 语言文字替换 2020-07-25 20:42:11 +08:00
altair 82927d38c0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 20:39:36 +08:00
altair 9f5b75213e 修改特效配置 2020-07-25 20:39:20 +08:00
skuld 7731aa45b8 修改猎妖之路为大闹天宫 2020-07-28 22:36:17 +08:00
altair 3b26247c5d 修改图鉴图片 2020-07-25 19:47:49 +08:00
altair 8afcc5fdf4 修改图鉴图片 2020-07-25 19:43:31 +08:00
altair fcdf21e2bd 修改立绘错误 2020-07-25 18:51:08 +08:00
gaoxin 5d6543caee Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 18:37:27 +08:00
gaoxin 0a35d31531 关闭星成长礼拍脸 2020-07-25 18:37:19 +08:00
altair 901442e847 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 18:34:38 +08:00
altair b435345177 修改声效触发时机 2020-07-25 18:34:26 +08:00
kansa 686ae9a826 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 18:07:35 +08:00
kansa b4577b9718 修改竞技场机器人库,使其匹配大闹天宫 2020-07-25 18:07:13 +08:00
shihongyi 7028de188e bug 2020-07-25 18:02:58 +08:00
altair 71438e88c3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 17:39:34 +08:00
altair 8281ce1733 添加缺失效果 2020-07-25 17:38:52 +08:00
shihongyi 671441d305 巅峰时间、充值屏蔽 2020-07-25 17:16:58 +08:00
zhangqiang a65257a740 剑影仙踪去掉拍脸 2020-09-11 21:37:17 +08:00
gaoxin 2b7eb6bf2a Merge branch '英雄技能特效添加' into master_develop
# Conflicts:
#	Assets/Effect/Prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_01.prefab.meta
#	Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua.meta
2020-07-25 16:13:55 +08:00
altair 773448d96c 修改特效 2020-07-25 16:11:10 +08:00
zhangqiang 1845d662ab 巅峰战竞猜结果新加界面 新手引导修改主线开始战斗按钮名称 2020-09-07 21:15:40 +08:00
shihongyi ab7e0c022d test 2020-07-25 14:06:55 +08:00
shihongyi 5623050a01 变强屏蔽充值跳转、屏蔽巅峰商店 2020-07-24 19:20:13 +08:00
skuld f6415aa772 修改巅峰赛规则 2020-08-05 23:19:28 +08:00
shihongyi 05f0d11729 巅峰战战斗回合、充值留特权商城 2020-07-24 17:15:30 +08:00
kansa 44b83f6fdd 修改圣物错误描述 2020-07-24 17:13:25 +08:00
shihongyi 409874c052 限时折扣推送 18级 因屏蔽充值 改998 2020-07-24 16:15:43 +08:00
shihongyi cac0384012 屏充值 2020-07-24 16:04:31 +08:00
shihongyi 1ffb97cf9f 巅峰赛开启时间 2020-07-24 15:16:44 +08:00
shihongyi bffd51518d 归元 2020-07-24 12:10:35 +08:00
skuld be095cbb7b 修改竞技场帮助文本 2020-07-24 11:19:16 +08:00
shihongyi a5e0f98bcd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-24 10:46:12 +08:00
shihongyi d4f48e575d 暂屏付费之2 2020-07-24 10:45:51 +08:00
kansa cbfc420a96 修改竞技场刷新时间为7天 2020-07-24 10:43:32 +08:00
shihongyi dc9fa4e880 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-24 10:08:06 +08:00
shihongyi 7418fd2fa7 暂屏充值test 2020-07-24 10:06:54 +08:00
zhangqiang 3fa23c25ea 修改界面id 2020-07-23 21:29:40 +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
shihongyi d820ef152a bugfix 2020-07-23 18:19:26 +08:00
zhangqiang 94684153c3 回放三局两胜显示 2020-07-23 18:06:55 +08:00
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
zhangqiang 3b3dbec6a7 添加巅峰赛编队 2020-07-23 14:36:28 +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
gaoxin 3cf3cf7e90 特效旋转功能添加 2020-07-23 13:44:03 +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
gaoxin 560b366938 添加前置特效转向的效果 2020-07-22 14:49:32 +08:00
liujiaqi 5a6b495481 七日狂欢,6 7天奖励修改 2020-07-22 14:43:57 +08:00
altair 8b06b6dd95 标注修改部分 2020-07-22 11:12:25 +08:00
skuld 804bca6284 添加宝物分解玩法规则 2020-07-22 10:51:38 +08:00
skuld c7bc3973e7 修改归元帮助文本 2020-07-22 10:46:55 +08:00
ZhangBiao 2d79cc70e5 【战斗】解锁倍速提示,VIP改成特权 2020-07-22 10:33:31 +08:00
gaoxin abf8830744 前置特效添加全屏类型 2020-07-21 21:34:47 +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
gaoxin f420ee3bd7 Merge branch 'master_develop' into 英雄技能特效添加
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ab_lzhl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_axl_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_bah_dww01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_bxxz_lhzf01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_chdr_qsqy01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_cy_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dhc_dhjf01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dj_hmhx01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dlsm_hskj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dm_lrzj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dst_zxtsl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dz_htjl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_eh_hslc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_fhlh_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ft_csl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_fx_lrzs01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_gg_alky01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ghn_ysyn01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hdxj_llhl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hhe_swzh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hsmw_swzh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hxps_xtcz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jcdp_dpzc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jgtn_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jhns_ylp01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jhxn_wxlz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jl_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jll_yjl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jls_jlsw01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jmm_myjm01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jw_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jy_jyh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jzy_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lc_ssym01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ldb_qzjfl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ljgz_hllw01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ls_lshd01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lsx_swz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lzz_fjlyl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mjn_lhj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mp_lqfc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mslz_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mw_mwz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mz_dzcx01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mz_pxz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_nxq_lyc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ny_qmsg01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_qxn_yyw01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_rd_gftm01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_sdxj_sbj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_sgb_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_sjll_bgxp01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_tljz_zxxzl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ts_jzlcl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_tyxj_tyyq01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_wg_wgfg01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_xllh_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_yc_ycmh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ygl_yll01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ygps_ysqr01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_yj_fjcy01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ylw_pgdm01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_zbj_tpywl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_zz_zzm01.mp3.meta
#	data_execl/base_data/CombatControl.xlsx
2020-07-21 14:48:51 +08:00