Commit Graph

964 Commits (b279baaa4109162fd79442542a5c8df2bf097418)

Author SHA1 Message Date
zhangqiang b279baaa41 公会副本提交 2020-08-22 13:49:47 +08:00
zhangqiang 4ed5ba896a 公会副本号角 2020-08-21 19:09:33 +08:00
zhangqiang 40bc0cef59 漏提 2020-08-21 18:24:16 +08:00
zhangqiang 0759809be9 公会副本提交 2020-08-21 18:22:53 +08:00
zhangqiang b725617a8d 公会副本提交 2020-08-21 15:52:49 +08:00
zhangqiang c08c537b16 公会副本提交 2020-08-20 20:05:38 +08:00
zhangqiang 869481a2cd 公会副本部分提交 2020-08-19 17:28:17 +08:00
zhangqiang c6b0acb7d8 Merge branch 'master_develop' into 0功能/公会副本
# Conflicts:
#	data_execl/base_data/MonsterConfig.xlsx
2020-08-18 19:36:17 +08:00
zhangqiang 00f1060be7 公会副本提交初始界面 2020-08-18 19:33:31 +08:00
ZhangBiao f18973cea9 极速达人修改 2020-08-18 19:17:20 +08:00
gongjiawei af6dcc4410 音频更新 2020-08-18 16:23:57 +08:00
jiaoyangna e2b2517ad0 live2d commit 2020-08-18 15:42:21 +08:00
jiaoyangna 95593175ec dailycarbonpanel update 2020-08-18 14:00:03 +08:00
jiaoyangna a5209137f0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-18 10:34:27 +08:00
jiaoyangna 3e9fcb7e71 xuanyuan update 2020-08-18 10:33:19 +08:00
jiaoyangna 92447e21a8 列表优化提交 2020-08-18 10:22:24 +08:00
wangzhenxing 98eb034cfc Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-18 10:26:44 +09:00
wangzhenxing d16361e4d1 纵排改为仇恨目标 2020-08-18 10:26:24 +09:00
wangzhenxing 46ec8ef4b4 吸血修改,由finalDamage 改为 damage 2020-08-17 19:15:04 +09:00
gongjiawei 5954f92915 音频更新 2020-08-17 18:33:05 +08:00
zhangqiang c67951f5fb 公会副本资源提交 2020-08-17 16:19:25 +08:00
wangzhenxing cd5f26e8af 完整显示多段伤害 2020-08-17 17:12:34 +09:00
zhangqiang cdf78a9dcf 剑影仙踪资源提交 2020-08-17 15:59:33 +08:00
jiaoyangna 7ff435c765 xuanyuan update 2020-08-17 15:48:40 +08:00
jiaoyangna 17524007d7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-17 15:18:03 +08:00
jiaoyangna 0210dc3109 conflict commit 2020-08-17 15:17:58 +08:00
ZhangBiao 77b3386efb Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-17 11:57:01 +08:00
ZhangBiao c2fdcb06bd 极速达人 2020-08-17 11:56:38 +08:00
zhangqiang 6df142b067 修改bug 分解吞宝器 宝器穿的不显示属性 婚姻副本跳转 宝器合成背景隐藏 2020-08-17 11:39:41 +08:00
jl_ios 21ea44a475 导表工具完善 2020-08-15 16:42:55 +08:00
gaoxin d256a6da7c 符号错误 2020-08-15 15:21:56 +08:00
gaoxin dc1188b886 修复非Android和Ios版本会报错的问题 2020-08-15 15:20:02 +08:00
gaoxin fcda2d9d1d 导表工具添加 2020-08-15 15:09:27 +08:00
jl_ios 7dbd376327 Merge branch '0功能/iOS-sdk' into master_develop 2020-08-15 11:45:59 +08:00
jl_ios e5015da253 添加iossdk接口 2020-08-15 10:13:32 +08:00
ZhangBiao 2063690199 2020-08-14 23:34:23 +08:00
jiaoyangna d97203bf0b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-14 21:05:30 +08:00
jiaoyangna 740eb7253d xuanyuan commit 2020-08-14 20:41:07 +08:00
JieLing 66687a1ce4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-14 17:49:33 +08:00
jiaoyangna 481c818ffa Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-14 17:43:30 +08:00
jiaoyangna 84f82d488d live2d commit 2020-08-14 17:43:24 +08:00
JieLing 7453825d63 Merge branch 'master_develop' into 0功能/资源加密方式二
# Conflicts:
#	Assets/ManagedResources/Icons/c_dhdj_00042_t1.png.meta
#	Assets/ManagedResources/Icons/c_dhdj_00042_t3.png.meta
#	Assets/ManagedResources/Icons/c_ttjz_00048_t1.png.meta
#	Assets/ManagedResources/Icons/c_ttjz_00048_t3.png.meta
#	Assets/ManagedResources/Spine/c_dhdj_00042/c_dhdj_00042.png.meta
2020-08-14 17:41:21 +08:00
JieLing 5e9448dd24 资源提交, 2020-08-14 17:35:18 +08:00
JieLing ad3ee94a75 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
jiaoyangna 0b157b6ee8 轩辕宝镜入口替换 2020-08-14 16:09:00 +08:00
wangzhenxing 78e2d45288 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-14 16:51:03 +09:00
liujiaqi cda648c50a 新东华帝君通天教主123星大小卡牌 2020-08-14 16:45:09 +08:00
wangzhenxing e139a43f65 屏蔽金翅大鹏不死效果 2020-08-14 16:50:32 +09:00
jiaoyangna e88e7544c2 通关豪礼替换 2020-08-14 14:41:29 +08:00
jiaoyangna 4604df2d0b 修改轩辕副本立绘 2020-08-14 14:36:24 +08:00