ZhangBiao
|
a07830ea52
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-21 14:36:54 +08:00 |
ZhangBiao
|
9f9f430976
|
道具标签不对应修改
|
2020-07-21 14:36:15 +08:00 |
gaoxin
|
02b37b2d67
|
Merge branch 'master_develop' into master_test
|
2020-07-20 19:58:43 +08:00 |
zhangqiang
|
99f885ac22
|
竞技场宝箱奖励位置可配
|
2020-07-20 16:01:16 +08:00 |
zhangqiang
|
a325bfb781
|
竞技场排名
|
2020-07-20 15:34:30 +08:00 |
zhangqiang
|
c471a9ccd5
|
竞技场替换宝箱效果图替换
|
2020-07-20 11:28:19 +08:00 |
zhangqiang
|
a8427d034c
|
字体修改
|
2020-07-17 19:48:25 +08:00 |
zhangqiang
|
57981fc393
|
字体修改
|
2020-07-17 19:36:23 +08:00 |
JieLing
|
29fc6f99eb
|
Merge branch 'master_develop' into master_test
|
2020-07-17 17:00:55 +08:00 |
zhangqiang
|
6e59d44e5a
|
先屏蔽宝器一键合成
|
2020-07-17 16:40:38 +08:00 |
JieLing
|
c46047fe2c
|
Merge branch 'master_develop' into master_test
# Conflicts:
# data_execl/base_data/GuideConfig.xlsx
|
2020-07-17 16:13:04 +08:00 |
ZhangBiao
|
2db96229ca
|
战斗跳过按钮大小调整
|
2020-07-17 16:05:39 +08:00 |
ZhangBiao
|
b20e5e2f54
|
十绝阵伤害显示调整
|
2020-07-17 14:40:33 +08:00 |
ZhangBiao
|
058d079190
|
18岁
|
2020-07-17 13:58:22 +08:00 |
ZhangBiao
|
63b8b36a37
|
剔除logo等信息
|
2020-07-17 13:38:02 +08:00 |
ZhangBiao
|
3231f857af
|
工会祭祀援助红点、十绝阵排行修改
|
2020-07-16 20:53:17 +08:00 |
JieLing
|
2be4cc20e6
|
Merge branch 'master_develop' into master_test
# Conflicts:
# .gitignore
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# data_execl/base_data/CombatControl.xlsx
# data_execl/base_data/GuideConfig.xlsx
|
2020-07-16 20:08:11 +08:00 |
ZhangBiao
|
e36a85bcb2
|
充点小钱资源替换
|
2020-07-16 18:17:27 +08:00 |
ZhangBiao
|
0ee5c9dabe
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 17:00:06 +08:00 |
ZhangBiao
|
cb56ec6b22
|
森罗小游戏bug修改
|
2020-07-16 16:59:46 +08:00 |
zhangqiang
|
864e3b739d
|
首冲
|
2020-07-16 16:57:36 +08:00 |
zhangqiang
|
85663ecfb4
|
首冲
|
2020-07-16 15:02:38 +08:00 |
ZhangBiao
|
afa02aae2e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 13:45:50 +08:00 |
ZhangBiao
|
9d47ce9767
|
小游戏bug修复
|
2020-07-16 13:45:07 +08:00 |
jiaoyangna
|
adc3b71e40
|
分解修改提交
|
2020-07-16 10:49:01 +08:00 |
ZhangBiao
|
18c189cd0c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-15 16:36:52 +08:00 |
ZhangBiao
|
de9290e4a0
|
物品掉落特效+跳过按钮
|
2020-07-15 16:35:51 +08:00 |
jiaoyangna
|
e15bf9a7b2
|
轩辕宝镜资源提交
|
2020-07-15 16:27:58 +08:00 |
ZhangBiao
|
9497cfae78
|
bug修改
|
2020-07-15 15:03:23 +08:00 |
ZhangBiao
|
9e23f56e00
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-15 13:41:44 +08:00 |
ZhangBiao
|
9f59d1f574
|
森罗幻境 小游戏与效果图的差异修改
|
2020-07-15 13:41:29 +08:00 |
zhangqiang
|
ed5a942875
|
探宝红点未完成
|
2020-07-15 13:34:13 +08:00 |
ZhangBiao
|
de81c1f5c2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-15 11:15:41 +08:00 |
ZhangBiao
|
10414deee5
|
领取挂机宝箱时,增加道具获取动画效果 修改
|
2020-07-15 11:15:29 +08:00 |
jiaoyangna
|
ee95a1ee55
|
【探宝优化】增加每日探宝次数限制
|
2020-07-15 11:07:32 +08:00 |
zhangqiang
|
b682f97e66
|
首充第一版修改
|
2020-07-15 10:36:57 +08:00 |
ZhangBiao
|
2ab6d17841
|
森罗小游戏修改
|
2020-07-14 21:03:44 +08:00 |
ZhangBiao
|
06e87b8c66
|
bug修改
|
2020-07-14 11:43:30 +08:00 |
ZhangBiao
|
39bd3e8523
|
限时召唤ui调整
|
2020-07-14 11:34:40 +08:00 |
ZhangBiao
|
eddaa95312
|
宝囊
|
2020-07-14 11:05:47 +08:00 |
jiaoyangna
|
791af67033
|
【公会祭祀】祭祀进度条显示不准确
|
2020-07-13 20:47:11 +08:00 |
ZhangBiao
|
4c6369e51d
|
乾坤宝囊修改
|
2020-07-13 20:07:06 +08:00 |
ZhangBiao
|
1645736a5c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 16:41:50 +08:00 |
ZhangBiao
|
416ba72c2f
|
森罗小游戏bug修改
|
2020-07-13 16:41:35 +08:00 |
jiaoyangna
|
b2c9b88991
|
【装备】在成员信息界面,点击主线编队内的神将信息,穿戴的装备可以分解
|
2020-07-13 16:16:56 +08:00 |
jiaoyangna
|
0fb81547d3
|
分解提交
|
2020-07-11 16:21:15 +08:00 |
jiaoyangna
|
3a85c6e339
|
分解,限时召唤提交
|
2020-07-10 18:29:38 +08:00 |
JieLing
|
9b97aef3d7
|
内网 0.15.15
|
2020-07-10 18:20:58 +08:00 |
ZhangBiao
|
b89c0582c0
|
宝囊
|
2020-07-10 17:55:11 +08:00 |
2han9B1a0
|
ce1d7014f3
|
|
2020-07-09 19:59:23 +08:00 |