ZhangBiao
|
79774302f5
|
【社稷大典】左上公会排行空白修改
(cherry picked from commit 5a20d41b77)
|
2020-10-26 17:17:20 +08:00 |
ZhangBiao
|
e03d5449e5
|
【社稷大典】打开社稷大典界面 时被提出公会 检测
(cherry picked from commit 0340b7d468)
|
2020-10-26 17:17:12 +08:00 |
jiaoyangna
|
f47ca02503
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 17:14:49 +08:00 |
jiaoyangna
|
db98590cf3
|
【灵兽系统】召唤修改
|
2020-10-26 17:14:24 +08:00 |
zhangqiang
|
35f64de903
|
【灵兽系统】 修改预设加载
|
2020-10-26 17:11:04 +08:00 |
ZhangBiao
|
6149e88620
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 17:04:28 +08:00 |
ZhangBiao
|
c2612e2ca8
|
【社稷大典】捐献后 左上角 按钮状态切换修复
|
2020-10-26 17:04:07 +08:00 |
JieLing
|
0b8abaeabf
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 16:51:53 +08:00 |
jiaoyangna
|
d8f5a48811
|
【累计充值】提示修改
|
2020-10-26 16:51:47 +08:00 |
ZhangBiao
|
a9e8cad755
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 16:50:03 +08:00 |
ZhangBiao
|
5a20d41b77
|
【社稷大典】左上公会排行空白修改
|
2020-10-26 16:49:47 +08:00 |
JieLing
|
a33ac4576f
|
添加一个特效打包路径
|
2020-10-26 16:45:43 +08:00 |
gaoxin
|
00f262d2f4
|
【灵兽】战斗内灵兽头像显示添加
|
2020-10-26 16:45:33 +08:00 |
jiaoyangna
|
37259287a4
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 16:43:37 +08:00 |
jiaoyangna
|
94858e80ff
|
【主题活动-累计充值】 文字提示修改
|
2020-10-26 16:43:22 +08:00 |
ZhangBiao
|
0340b7d468
|
【社稷大典】打开社稷大典界面 时被提出公会 检测
|
2020-10-26 16:37:56 +08:00 |
ZhangBiao
|
b2c841e572
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 16:11:11 +08:00 |
ZhangBiao
|
709dc1a5bd
|
【社稷大典】时间弹跳修复,物品边框颜色修改
|
2020-10-26 16:10:58 +08:00 |
liujiaqi
|
e80c0f8e0d
|
【社稷大典】商店标题资源替换
|
2020-10-26 16:06:55 +08:00 |
jiaoyangna
|
573fc1d5f8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 16:01:34 +08:00 |
jiaoyangna
|
1ebd6a5727
|
灵兽召唤提交
|
2020-10-26 16:00:34 +08:00 |
zhangqiang
|
2a6954293a
|
【灵兽系统】 灵兽羁绊战力计算修改
|
2020-10-26 15:47:14 +08:00 |
JieLing
|
21f0e6abfb
|
【逍遥游】动画资源引用错误
|
2020-10-26 15:46:24 +08:00 |
wangzhenxing
|
c5b97f3cda
|
灵兽去除log
|
2020-10-26 16:42:48 +09:00 |
JieLing
|
0b2a309b60
|
【逍遥游】删除旧骰子资源
|
2020-10-26 15:39:49 +08:00 |
gaoxin
|
76dadc8077
|
【逍遥游】合并后资源缺失
|
2020-10-26 15:30:24 +08:00 |
wangzhenxing
|
443bdab87f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 16:27:38 +09:00 |
ZhangBiao
|
1444c0712c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 16:25:44 +08:00 |
ZhangBiao
|
d4b75e0d73
|
【社稷大典】时间弹跳修复,物品边框颜色修改
(cherry picked from commit 709dc1a5bd)
|
2020-10-26 16:24:16 +08:00 |
ZhangBiao
|
ddd417b3f3
|
【社稷大典】捐献品价值修改
(cherry picked from commit d30209f844)
|
2020-10-26 16:24:06 +08:00 |
ZhangBiao
|
55f9ccdb86
|
【社稷大典】捐献品3 点击加号跳转
(cherry picked from commit 469235ff74)
|
2020-10-26 16:23:58 +08:00 |
ZhangBiao
|
8f0553c1f6
|
【社稷大典】长按贡献数量不够无法捐赠bug修复
(cherry picked from commit e6610518ce)
|
2020-10-26 16:23:50 +08:00 |
ZhangBiao
|
5bf6dfb39f
|
【社稷大典】提交8 漏题补
|
2020-10-26 16:23:40 +08:00 |
yuanshuai
|
46b48f53d9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 16:21:54 +08:00 |
yuanshuai
|
8015f4cfc7
|
【逍遥游】犀牛贺州地图资源提交
|
2020-10-26 16:21:42 +08:00 |
wangzhenxing
|
91ed513602
|
人物信息修改提交
|
2020-10-26 16:26:21 +09:00 |
yuanshuai
|
0fee60ea37
|
【逍遥游】骰子动画修改
|
2020-10-26 15:19:33 +08:00 |
gaoxin
|
71dc347456
|
【逍遥游】删除旧骰子动画,修复新动画缺失的问题
|
2020-10-26 15:18:32 +08:00 |
gaoxin
|
c2db80b5bf
|
【逍遥游】骰子资源提交
|
2020-10-26 15:15:56 +08:00 |
jiaoyangna
|
942849cdcf
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 15:06:24 +08:00 |
jiaoyangna
|
ce5db82250
|
乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改
|
2020-10-26 15:05:59 +08:00 |
gaoxin
|
343237ae6d
|
【灵兽】战斗数据协议添加,修复战斗数据组建错误
|
2020-10-26 14:56:03 +08:00 |
zhangqiang
|
0a5816a4ec
|
线上问题工会技能战力修改
|
2020-10-26 14:47:14 +08:00 |
zhangqiang
|
b6f48c4910
|
线上战力 属性取整问题
|
2020-10-26 14:46:43 +08:00 |
wangzhenxing
|
71f365b3e4
|
人物信息显示修改
|
2020-10-26 15:35:03 +09:00 |
jiaoyangna
|
bdfb518274
|
乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改
|
2020-10-26 15:11:44 +08:00 |
jiaoyangna
|
88afa2d704
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 15:07:13 +08:00 |
yuanshuai
|
e37e260678
|
Merge branch 'master_devlop_ys' into master_develop
|
2020-10-26 15:05:43 +08:00 |
yuanshuai
|
afd0b542fe
|
骰子动画修改
|
2020-10-26 15:04:44 +08:00 |
gaoxin
|
1dc2b96916
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 14:57:05 +08:00 |