Commit Graph

273 Commits (42740e5e19f60d045de9e3e996ba21ca80fbbd40)

Author SHA1 Message Date
altair 42740e5e19 修改指引文字 2020-07-28 20:09:39 +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 039e831582 修改图标 2020-07-25 20:47:20 +08:00
altair 9f5b75213e 修改特效配置 2020-07-25 20:39:20 +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