zhangqiang
|
eefc951468
|
提交
|
2020-09-30 11:45:49 +08:00 |
JieLing
|
0064670621
|
遴选提交
|
2020-09-30 11:44:00 +08:00 |
jiaoyangna
|
01b300fb30
|
主题活动修改
|
2020-10-15 16:19:59 +08:00 |
jiaoyangna
|
67c728f576
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-30 17:11:42 +08:00 |
jiaoyangna
|
5e97e20e57
|
十绝阵特效修改
|
2020-09-30 17:10:58 +08:00 |
ZhangBiao
|
d15da5d1e7
|
主题活动预设修改
|
2020-09-29 15:59:16 +08:00 |
ZhangBiao
|
f0ccc8caf5
|
丹心碧血 预设提交
|
2020-09-29 15:54:26 +08:00 |
ZhangBiao
|
71cd037aa4
|
Merge branch 'master_develop' into 0活动开发聚集地/社稷大典
|
2020-09-29 15:52:38 +08:00 |
ZhangBiao
|
6524be790b
|
设计大点界面
|
2020-09-29 15:51:25 +08:00 |
wangzhenxing
|
307f8b484f
|
义结金兰魂印bug修改提交
|
2020-09-29 16:36:51 +09:00 |
jiaoyangna
|
8690da53d0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-29 15:35:27 +08:00 |
jiaoyangna
|
574c7d093d
|
丹心碧血图片提交
|
2020-09-29 15:35:08 +08:00 |
gaoxin
|
9f38a8e436
|
注释无用代码,修复vip奖励领取保错
|
2020-09-28 20:11:57 +08:00 |
gaoxin
|
8c17716e1c
|
默认头像修改
|
2020-09-28 17:34:39 +08:00 |
zhangqiang
|
ef70664094
|
适配
|
2020-09-28 16:57:03 +08:00 |
gaoxin
|
029d7d7097
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-28 16:26:26 +08:00 |
gaoxin
|
04cc2529fa
|
战斗log日志优化
|
2020-09-28 16:26:20 +08:00 |
ZhangBiao
|
5320fb5211
|
女人物大小修改
|
2020-09-28 16:05:34 +08:00 |
ZhangBiao
|
acd0730f5d
|
|
2020-09-28 11:14:17 +08:00 |
gongjiawei
|
e3e1bd33d6
|
音频更新
|
2020-09-28 10:28:02 +08:00 |
jiaoyangna
|
a8b6fdcec3
|
轩辕修改提交
|
2020-09-27 20:20:04 +08:00 |
gaoxin
|
91cd6c7174
|
头像默认显示复原
|
2020-09-27 19:04:17 +08:00 |
jiaoyangna
|
349316e2d7
|
时间销毁
|
2020-09-28 05:01:06 +08:00 |
ZhangBiao
|
22832d895e
|
社稷大典
|
2020-09-27 16:00:15 +08:00 |
ZhangBiao
|
3f00df0ee7
|
Revert "社稷大典 占坑"
This reverts commit 28bd8d4e73.
(cherry picked from commit 11b0361f15)
|
2020-09-27 11:17:46 +08:00 |
ZhangBiao
|
d527c81d11
|
|
2020-09-27 10:15:05 +08:00 |
ZhangBiao
|
28bd8d4e73
|
社稷大典 占坑
(cherry picked from commit a97d8c4348)
|
2020-09-27 10:10:51 +08:00 |
jiaoyangna
|
a6fd0d2aa6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-25 23:10:47 +08:00 |
gaoxin
|
36ebddb517
|
物品框添加头像框的特效
|
2020-09-27 15:04:12 +08:00 |
gaoxin
|
96ac81c098
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-27 13:33:39 +08:00 |
gaoxin
|
525e229273
|
部分界面头像特效添加
|
2020-09-27 13:33:10 +08:00 |
ZhangBiao
|
11b0361f15
|
Revert "社稷大典 占坑"
This reverts commit 28bd8d4e73.
|
2020-09-27 11:16:27 +08:00 |
ZhangBiao
|
b606b87bb2
|
Revert ""
This reverts commit d527c81d11.
|
2020-09-27 11:16:21 +08:00 |
ZhangBiao
|
62300c0bff
|
|
2020-09-27 10:15:40 +08:00 |
ZhangBiao
|
a97d8c4348
|
社稷大典 占坑
|
2020-09-27 10:10:16 +08:00 |
jiaoyangna
|
278d9f8943
|
碎片属性图片修改提交
|
2020-09-25 23:09:48 +08:00 |
jiaoyangna
|
af8b461b50
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-10 16:39:53 +08:00 |
jiaoyangna
|
de81143689
|
积天豪礼修改
|
2020-10-10 16:39:30 +08:00 |
ZhangBiao
|
5b47c9c889
|
虚位以待字体颜色修改
|
2020-09-25 18:16:37 +08:00 |
ZhangBiao
|
af8e68da78
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-02 00:18:39 +08:00 |
ZhangBiao
|
90cab5221d
|
三界降魔
|
2020-10-02 00:18:17 +08:00 |
gongjiawei
|
b475b1b159
|
音频更新
|
2020-09-25 17:02:14 +08:00 |
gongjiawei
|
d53b165d16
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-25 16:43:18 +08:00 |
gongjiawei
|
8fff93eccc
|
音频更新
|
2020-09-25 16:42:56 +08:00 |
gongjiawei
|
6948cb36b6
|
音频更新
|
2020-09-25 15:48:52 +08:00 |
ZhangBiao
|
9b9c094f3b
|
Merge branch '0活动开发聚集地/三界除魔' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
|
2020-09-25 15:28:37 +08:00 |
ZhangBiao
|
bec9ecf6d3
|
三界降魔
|
2020-09-25 15:24:59 +08:00 |
jiaoyangna
|
afc1d269c2
|
限时折扣提交
|
2020-09-25 15:03:12 +08:00 |
jiaoyangna
|
9937a05d97
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-25 14:59:27 +08:00 |
jiaoyangna
|
cae421024a
|
积天豪礼添加动画
|
2020-09-25 14:59:05 +08:00 |