jiaoyangna
|
be5eff5373
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-17 15:49:02 +08:00 |
jiaoyangna
|
7ff435c765
|
xuanyuan update
|
2020-08-17 15:48:40 +08:00 |
liujiaqi
|
803a7f4797
|
开探索达人
|
2020-08-17 15:48:05 +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 |
liujiaqi
|
9b6277f8fe
|
极速达人
|
2020-08-17 14:38:14 +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 |
liujiaqi
|
0734888ef5
|
极速达人时间修改
|
2020-08-14 20:57:12 +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 |
lihaiyang
|
9391b8d988
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 17:12:54 +08:00 |
lihaiyang
|
8e438f9d20
|
开启时间修正
周一开启妖灵宝境;
周二开启佛禅宝境;
周三开启人杰宝境;
周四开启道玄宝境;
周五开启妖灵宝境和人杰宝境;
周六开启佛禅宝境和道玄宝境;
周日开启所有四种宝境。
|
2020-08-14 17:11:58 +08:00 |
liujiaqi
|
cda648c50a
|
新东华帝君通天教主123星大小卡牌
|
2020-08-14 16:45:09 +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 |
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
|
cb8174dd85
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 14:17:45 +08:00 |
jiaoyangna
|
3834e1960e
|
图片导入
|
2020-08-14 14:17:38 +08:00 |
shihongyi
|
768ea83f23
|
塔战力
|
2020-08-14 14:09:04 +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 |
liujiaqi
|
8366d5d54e
|
大小经验金币包矿镐,矿镐包,一键购买
|
2020-08-14 11:16:18 +08:00 |
shihongyi
|
acd9da4f15
|
暂时开启云梦祈福
|
2020-08-14 10:46:55 +08:00 |
ZhangBiao
|
92a2eb18a0
|
Merge branch '0功能/活动' into master_develop
|
2020-08-14 10:15:49 +08:00 |
ZhangBiao
|
7a1e1599d8
|
|
2020-08-14 10:14:53 +08:00 |
JieLing
|
be59c59230
|
部分大图资源整理
|
2020-08-14 10:02:24 +08:00 |
lihaiyang
|
95d6d13f25
|
轩辕全天开启 英文名字重复
|
2020-08-14 09:40:52 +08:00 |
ZhangBiao
|
416d6eb16c
|
每日签到
|
2020-08-13 22:30:09 +08:00 |