Commit Graph

847 Commits (9d5280d025ed030ed5b9423bbdbdbe9cd7a9877a)
 

Author SHA1 Message Date
altair 9d5280d025 修改道具名称 2020-07-28 15:37:52 +08:00
shihongyi fa241a43b2 限时通关首个钻石改10连、竞技场寻宝微调 2020-07-28 15:26:00 +08:00
ZhangBiao 1868a14b08 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 15:24:21 +08:00
ZhangBiao 52c34aa2a3 花费妖晶抽卡提示优化 2020-07-28 15:24:11 +08:00
jiaoyangna 119c4e4204 漏提 2020-07-28 15:16:04 +08:00
jiaoyangna d5b15a17ee Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/functions.lua
2020-07-28 15:08:24 +08:00
zhangqiang 565d0392fc 背景颜色根据星级变化 2020-07-31 15:40:43 +08:00
zhangqiang b63e9b7e81 英雄添加按战力排序 2020-07-31 14:45:32 +08:00
jiaoyangna 99f9e7169e 添加特效 2020-07-28 15:06:47 +08:00
ZhangBiao 146197b320 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 10:42:38 +08:00
ZhangBiao ee79439f39 万象境 bug修复 2020-07-28 10:42:29 +08:00
gaoxin 48a39d2fae 游戏logo替换 2020-07-28 10:40:02 +08:00
szxhzz 2175be7bfc 配音更新 2020-07-28 10:25:46 +08:00
ZhangBiao f26718899e bug修复 2020-07-28 10:24:52 +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 440a629582 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 21:04:59 +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
jiaoyangna b6c2b22a3d 【日常副本优化】每个日常副本标题下方增加副本描述文字 2020-07-27 20:34:59 +08:00
jiaoyangna 18c6ad6555 carbon prefab commit 2020-07-27 20:08:23 +08:00
altair 66f2e2860d 修改特效及文字表 2020-07-27 20:05:26 +08:00
jiaoyangna e1ebc7c169 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 19:48:16 +08:00
jiaoyangna 54b3aad5e9 【副本优化】副本入口处增加文字提示 2020-07-27 19:48:05 +08:00
gaoxin 0615469bb7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 19:45:50 +08:00
gaoxin c25fc7e39d bulletTime字段权限修改 2020-07-27 19:45:37 +08:00
ZhangBiao 6cff95eca9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 19:42:46 +08:00
ZhangBiao 66d7cc5ccc 2020-07-27 19:42:20 +08:00
shihongyi 854c359043 献祭、归元、吃掉返还调整 2020-07-27 18:23:37 +08:00
szxhzz 8d6448a2bd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 18:17:54 +08:00
zhangqiang 424d26200b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 01:24:39 +08:00
zhangqiang 5a32cb4eb6 xie yi change 2020-07-29 01:24:21 +08:00
szxhzz c02ccf8545 通用点击音效更新 2020-07-27 18:16:58 +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
jiaoyangna 0520ccb297 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 18:01:16 +08:00
jiaoyangna 40345b0ab7 十连抽提交 2020-07-27 18:00:45 +08:00
zhangqiang cf1bd66f22 预设微调 2020-07-29 00:50:13 +08:00
JieLing 64ff767121 Merge branch '接入SDK' into master_develop 2020-07-27 17:53:54 +08:00
JieLing 437d241532 猕猴桃sdk文件替换 2020-07-27 17:49:07 +08:00
JieLing 67914ba7dd 引导打点数据类型修改 2020-07-27 17:48:33 +08:00
ZhangBiao cbd607b479 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 17:22:23 +08:00
zhangqiang ac67088a90 背包合成不弹英雄展示 2020-07-29 00:11:36 +08:00
ZhangBiao 61aadd2cb8 跳过按钮lock大小调整 2020-07-27 17:21:16 +08:00
shihongyi 178b3054b7 道具商城 2020-07-27 17:00:52 +08:00
jiaoyangna 9abf33d1db Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 16:49:24 +08:00
zhangqiang 36e18b7519 背包碎片排序 限时兑换调整预设 2020-07-28 23:40:36 +08:00
jiaoyangna 1b9f8478cc role gps star update 2020-07-27 16:49:13 +08:00
JieLing a003779452 Merge branch '接入SDK' of http://60.1.1.230/gaoxin/JL_Client into 接入SDK 2020-07-27 16:41:44 +08:00
JieLing f5d0cc001c 添加打点数据类型 2020-07-27 16:41:38 +08:00
liujiaqi 807d6745ac 描述调整 2020-07-27 16:17:02 +08:00