Commit Graph

263 Commits (51c5aa453aef64eb9aeeff26f8070fa6f51ca1d2)

Author SHA1 Message Date
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