Commit Graph

71 Commits (66687a1ce4ed37630a483655b55736c64b753cff)

Author SHA1 Message Date
jiaoyangna 84f82d488d live2d commit 2020-08-14 17:43:24 +08:00
jiaoyangna 0b157b6ee8 轩辕宝镜入口替换 2020-08-14 16:09:00 +08:00
jiaoyangna 4604df2d0b 修改轩辕副本立绘 2020-08-14 14:36:24 +08:00
jiaoyangna 40b9550c54 修改轩辕副本立绘提交 2020-08-14 14:35:48 +08:00
jiaoyangna 1f7b161087 五星成长礼修改提交 2020-08-14 13:32:55 +08:00
jiaoyangna b2f5dbc2ca xuanyuan update 2020-08-13 14:43:44 +08:00
jiaoyangna 937d46ff75 xuanyuan commit 2020-08-12 21:10:47 +08:00
jiaoyangna a9ebd162ec 轩辕 提交 2020-08-12 21:10:36 +08:00
jiaoyangna 39fb3d113c xuyuan commit 2020-08-12 21:10:27 +08:00
jiaoyangna 96d47d34a8 Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua
#	data_execl/base_data/GlobalSystemConfig.xlsx
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/RechargeCommodityConfig.xlsx
2020-08-12 14:17:01 +08:00
jiaoyangna 7bee1280b3 xuanyuan update 2020-08-12 14:13:28 +08:00
jiaoyangna e372c84cdb xuanyuan 2020-08-12 13:34:07 +08:00
zhangqiang b67b99ad93 无尽副本临时新增入口 2020-08-11 16:31:17 +08:00
jiaoyangna 9f186311b3 xuanyuan 2020-08-11 15:11:33 +08:00
jiaoyangna 16e1699e65 no message 2020-08-11 11:58:41 +08:00
jiaoyangna 179632ca21 no message 2020-08-11 11:56:03 +08:00
jiaoyangna 6f05841519 no message 2020-08-11 11:00:30 +08:00
jiaoyangna dc058f99e1 no message 2020-08-11 10:13:50 +08:00
jiaoyangna 3d2f288934 轩辕宝镜提交 2020-08-11 09:48:21 +08:00
jiaoyangna 16d4b6477d no message 2020-08-06 17:37:07 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
jiaoyangna c095459166 no message 2020-08-05 21:01:20 +08:00
lihaiyang a6f1259075 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing 2020-08-05 18:06:28 +08:00
gaoxin 195a48d3fe 副本添加最大战斗力判断 2020-08-05 16:26:45 +08:00
jiaoyangna c5bced9968 副本修改提交 2020-08-05 15:00:56 +08:00
zhangqiang 54148395b4 日常副本判断开启临时添加战力计算 2020-08-07 06:06:55 +08:00
ZhangBiao ee28c18254 森罗bug修复 2020-08-04 20:22:56 +08:00
ZhangBiao 9b28e7c140 森罗bug修改 2020-08-03 16:59:37 +08:00
ZhangBiao 434aaeccff 魂印特效 无用log删除 2020-08-03 15:20:18 +08:00
jiaoyangna 242896fede add soulprint effect commit 2020-08-02 09:16:45 +08:00
jiaoyangna b54534db2f chechihongdian update 2020-07-29 18:27:07 +08:00
jiaoyangna c78cebde62 hongdianjiance tijao 2020-07-29 18:16:11 +08:00
jiaoyangna 66bfd4f4c9 车迟提交 2020-07-29 17:53:39 +08:00
jiaoyangna b2af34a2b3 副本红点提交 2020-07-29 17:50:15 +08:00
jiaoyangna 36070bc0c0 cardelaycarbon update 2020-07-28 22:25:51 +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
jiaoyangna 43ee7dd577 限时召唤提交 2020-07-28 20:09:41 +08:00
ZhangBiao ee79439f39 万象境 bug修复 2020-07-28 10:42:29 +08:00
jiaoyangna b6c2b22a3d 【日常副本优化】每个日常副本标题下方增加副本描述文字 2020-07-27 20:34:59 +08:00
jiaoyangna 54b3aad5e9 【副本优化】副本入口处增加文字提示 2020-07-27 19:48:05 +08:00
JieLing 0670160fd3 修复森罗幻境入口白片问题 2020-07-26 16:35:38 +08:00
jiaoyangna b1bf2876cb 10 star update 2020-07-25 21:57:46 +08:00
gaoxin b0002cf781 语言文字替换 2020-07-25 20:42:11 +08:00
jiaoyangna 7c92ddc60a 副本置灰修改提交 2020-07-25 18:35:05 +08:00
jiaoyangna b424927bbb tupian tijiao 2020-07-23 16:01:26 +08:00
jiaoyangna aefa2b0cac 添加一个万象境的入口列表 2020-07-23 15:42:42 +08:00
jiaoyangna cafa630185 Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2020-07-22 20:19:57 +08:00
jiaoyangna 03107d240a 轩辕宝镜提交 2020-07-21 10:42:20 +08:00