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 |
|
jiaoyangna
|
40b9550c54
|
修改轩辕副本立绘提交
|
2020-08-14 14:35:48 +08:00 |
|
jiaoyangna
|
d27b4b165f
|
资源名重复修改提交
|
2020-08-14 14:29:06 +08:00 |
|
jiaoyangna
|
3834e1960e
|
图片导入
|
2020-08-14 14:17:38 +08:00 |
|
jiaoyangna
|
1f7b161087
|
五星成长礼修改提交
|
2020-08-14 13:32:55 +08:00 |
|
jiaoyangna
|
905d77b0c6
|
Merge branches 'master_develop' and 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 13:01:17 +08:00 |
|
jiaoyangna
|
c9c3cb2fa4
|
operatingmanager commit
|
2020-08-14 13:01:12 +08:00 |
|
jiaoyangna
|
4c8d556b31
|
动态立绘提交
|
2020-08-14 12:59:19 +08:00 |
|
jiaoyangna
|
b4acffd954
|
动态立绘提交
|
2020-08-14 12:20:29 +08:00 |
ZhangBiao
|
7a1e1599d8
|
|
2020-08-14 10:14:53 +08:00 |
|
JieLing
|
be59c59230
|
部分大图资源整理
|
2020-08-14 10:02:24 +08:00 |
|
ZhangBiao
|
416d6eb16c
|
每日签到
|
2020-08-13 22:30:09 +08:00 |
|
JieLing
|
acf9a73068
|
重复引用资源修改
|
2020-08-13 19:40:50 +08:00 |
|
JieLing
|
700f396a6b
|
资源加密添加，防止使用工具获得资源
|
2020-08-13 19:30:16 +08:00 |
|
wangzhenxing
|
9dce11a6eb
|
测试战斗修改提交
|
2020-08-13 17:36:20 +09:00 |
|
ZhangBiao
|
e655562a71
|
|
2020-08-13 17:07:05 +08:00 |
|
ZhangBiao
|
9bac8e2bfc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 16:38:57 +08:00 |
|
ZhangBiao
|
e397fa88e7
|
|
2020-08-13 16:38:40 +08:00 |
|
wangzhenxing
|
442877d3e0
|
珍奇宝阁预设代码提交
|
2020-08-13 16:38:20 +09:00 |
|
jiaoyangna
|
fbf7c3b41d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 14:44:53 +08:00 |
|
jiaoyangna
|
7de60dea2b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 14:43:51 +08:00 |
|
ZhangBiao
|
a180f63fe7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 14:43:46 +08:00 |
|
jiaoyangna
|
b2f5dbc2ca
|
xuanyuan update
|
2020-08-13 14:43:44 +08:00 |
|
ZhangBiao
|
dd3c814c2a
|
四元阵中 添加 置换入口
|
2020-08-13 14:43:10 +08:00 |
gongjiawei
|
c18cb5fc01
|
音频更新
|
2020-08-13 14:23:37 +08:00 |
|
ZhangBiao
|
d1ec3fa196
|
每周 每月礼包阴影问题修复
|
2020-08-13 13:33:48 +08:00 |
|
ZhangBiao
|
2fe27c64ec
|
|
2020-08-13 12:33:21 +08:00 |
|
ZhangBiao
|
a6d69bd001
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 12:00:38 +08:00 |
|
ZhangBiao
|
f4dad25b7a
|
神将置换bug修复
|
2020-08-13 12:00:18 +08:00 |
gaoxin
|
de27163861
|
合成修改
|
2020-08-13 11:46:55 +08:00 |
|
gaoxin
|
b4eef8c285
|
神将合成显示修改
|
2020-08-13 11:11:26 +08:00 |
|
gaoxin
|
48d8f3887b
|
修改神将合成显示问题
|
2020-08-13 10:28:16 +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 |
zhangqiang
|
783583404e
|
神将合成修改提交
|
2020-08-12 20:59:20 +08:00 |
|
zhangqiang
|
058b18bc6f
|
最新表 协议数据
|
2020-08-12 18:29:11 +08:00 |
|
gongjiawei
|
0d0ae17a68
|
音频更新
|
2020-08-12 18:11:39 +08:00 |
|
gongjiawei
|
a5663aae42
|
音频更新
|
2020-08-12 17:53:48 +08:00 |