Commit Graph

640 Commits (19a2229fb8d673a33368260c6b3c5f07fd927c88)

Author SHA1 Message Date
jiaoyangna 36070bc0c0 cardelaycarbon update 2020-07-28 22:25:51 +08:00
ZhangBiao 97b7118e11 2020-07-28 22:05:24 +08:00
ZhangBiao 8639065f06 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 22:00:25 +08:00
zhangqiang 02f92f749f bug 2020-08-04 23:43:14 +08:00
ZhangBiao dea2d14d3f 乾坤宝盒时间修复 2020-07-28 22:00:11 +08:00
ZhangBiao fb5d81a7a4 bug修复 2020-07-28 21:18:40 +08:00
jiaoyangna 0a73f284ef carbon detail update 2020-07-28 20:58:28 +08:00
jiaoyangna 5d70187da8 副本修改提交 2020-07-28 20:51:28 +08:00
ZhangBiao ecfe1f5e33 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 20:14:40 +08:00
ZhangBiao 8c7b24ad9a bug修复 2020-07-28 20:13:09 +08:00
jiaoyangna 5df246c45b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 20:09:46 +08:00
jiaoyangna 43ee7dd577 限时召唤提交 2020-07-28 20:09:41 +08:00
gongjiawei 31826a5d08 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 19:45:06 +08:00
gongjiawei b9c15c6c23 音频更新 2020-07-28 19:44:57 +08:00
szxhzz 96fe229ade Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 19:44:15 +08:00
szxhzz 3814874c3f 音频更新 2020-07-28 19:43:35 +08:00
gongjiawei b9f6ef86e7 音频更新 2020-07-28 19:39:27 +08:00
gongjiawei efbfff0b3e 音頻跟新 2020-07-28 19:35:51 +08:00
szxhzz c879b10480 音频更新 2020-07-28 19:31:04 +08:00
jiaoyangna a3298ae117 星星预设提交 2020-07-28 19:21:16 +08:00
jiaoyangna 8a2a443168 星星提交 2020-07-28 19:18:45 +08:00
jiaoyangna bf77931b88 边框修改提交 2020-07-28 18:38:19 +08:00
altair a6b232757c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 18:22:19 +08:00
altair 2e046d4d74 修改特效 2020-07-28 18:22:11 +08:00
gaoxin e3e317fb5c 音频压缩、加载格式修改 2020-07-28 18:01:53 +08:00
zhangqiang acba506782 寻宝添加6星显示 2020-07-31 18:40:22 +08:00
ZhangBiao 88effd78f1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:26:50 +08:00
ZhangBiao 6c316bf7de 2020-07-28 17:25:50 +08:00
gaoxin 2df9b068b9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:24:15 +08:00
gaoxin 72921a8f51 修复行动时遭受异常状态死亡时会继续释放技能的问题 2020-07-28 17:19:57 +08:00
ZhangBiao 1f474fd636 2020-07-28 17:17:55 +08:00
ZhangBiao 771826da9c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:01:58 +08:00
ZhangBiao 018adbe85d 天宫秘宝入口关闭,修改乾坤宝盒魂印弹窗 2020-07-28 17:01:48 +08:00
gaoxin 5d6586a9a5 部分界面适配修改 2020-07-28 17:00:19 +08:00
jiaoyangna 25d535fa4c 关闭特效 2020-07-28 16:57:12 +08:00
jiaoyangna 60bf046b81 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 16:54:43 +08:00
jiaoyangna 38a69a4017 编队添加特效 2020-07-28 16:54:38 +08:00
ZhangBiao e2a8af9028 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 16:45:38 +08:00
zhangqiang 2a87d43fd0 bug 2020-07-31 17:36:06 +08:00
ZhangBiao ddfbb25e2e 森罗bug修复 2020-07-28 16:45:28 +08:00
gaoxin 5f6783fc13 新通用被击特效提交 2020-07-28 16:30:03 +08:00
gaoxin e7e3de1674 引导打点不再传递日期 2020-07-28 16:12:29 +08:00
gaoxin be57d5d44a 删除错误的spine 2020-07-28 16:11:04 +08:00
ZhangBiao b4b24e62be Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 15:57:51 +08:00
ZhangBiao a732396286 修复【乾坤宝】抽取获得的预览,可以操作装备出售 2020-07-28 15:57:36 +08:00
zhangqiang a7d6db223a war power change 2020-07-31 16:37:14 +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
jiaoyangna b6c2b22a3d 【日常副本优化】每个日常副本标题下方增加副本描述文字 2020-07-27 20:34:59 +08:00
jiaoyangna 18c6ad6555 carbon prefab commit 2020-07-27 20:08:23 +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
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
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 5a32cb4eb6 xie yi change 2020-07-29 01:24:21 +08:00
szxhzz c02ccf8545 通用点击音效更新 2020-07-27 18:16:58 +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 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
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
gaoxin ea7ee1141b 修复跳转充值界面后黑屏卡死的问题 2020-07-27 15:25:42 +08:00
gaoxin 48715b151a sdk修改 2020-07-27 14:42:25 +08:00
wangzhenxing 19a069994b 修改杨戬锤不死金翅大鹏一直锤的bug 2020-07-27 15:19:17 +09:00
gongjiawei 327cda1f37 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 14:21:24 +08:00
gongjiawei ffccc6d77a 音频更新 2020-07-27 14:20:50 +08:00
jiaoyangna e71f82795a 编队界面修改提交 2020-07-27 14:13:31 +08:00
ZhangBiao a53b1edd7d 元素共鸣 “已激活”字样删除 2020-07-27 11:00:08 +08:00
ZhangBiao e3eb566008 乾坤宝盒奖励概率错误修改 2020-07-27 09:59:50 +08:00
gaoxin 6bfa7d318b 注释代码 2020-07-26 17:28:44 +08:00
gaoxin eff6ee6d08 临时关闭星级成长礼显示 2020-07-26 16:44:31 +08:00
JieLing 0670160fd3 修复森罗幻境入口白片问题 2020-07-26 16:35:38 +08:00
JieLing cabc456d73 修复tapDB初始化参数错误的问题 2020-07-26 16:35:31 +08:00
gaoxin 3cd56b6ccc 修复森罗幻境底部人物星级显示错误的问题 2020-07-26 16:33:27 +08:00
gaoxin b323148076 尝试修改app安装事件在创建角色事件之后触发的问题 2020-07-26 11:14:29 +08:00
gaoxin b0503f795c 修复技能名称音效没有声音的问题 2020-07-26 11:13:25 +08:00
jiaoyangna 48c209b4aa formation commit 2020-07-25 22:58:55 +08:00
jiaoyangna b1bf2876cb 10 star update 2020-07-25 21:57:46 +08:00
zhangqiang 7f9c4f6862 提交 2020-09-13 22:25:50 +08:00
jiaoyangna 1802487345 itemview update 2020-07-25 20:56:23 +08:00
altair e98d50c3db 增加图片文件 2020-07-25 20:51:23 +08:00