jiaoyangna
|
c981f24ed0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-07 15:50:50 +08:00 |
jiaoyangna
|
4069c41f74
|
日常副本添加咸鱼积分奖励
|
2020-09-07 15:50:46 +08:00 |
ZhangBiao
|
b5ac787e16
|
数独小游戏15 1:2屏幕适配错误修复
购买回春散数量不增加修改
|
2020-08-31 15:45:16 +08:00 |
ZhangBiao
|
c7a290e605
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 15:22:28 +08:00 |
ZhangBiao
|
9bbe08043a
|
八日登陆刷新时间从24改道5
|
2020-08-31 15:22:22 +08:00 |
jiaoyangna
|
6d4e5dd390
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 15:01:25 +08:00 |
jiaoyangna
|
2bf39b8a9c
|
副本红点提交
|
2020-08-31 15:01:20 +08:00 |
ZhangBiao
|
d1e0e6e133
|
升级豪礼红点显示错误修复
|
2020-08-31 14:35:35 +08:00 |
jiaoyangna
|
c73406ca13
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 13:58:52 +08:00 |
ZhangBiao
|
b1f95890d3
|
天尊降世 领取顺序bug修复
|
2020-08-31 13:58:49 +08:00 |
jiaoyangna
|
366343b72b
|
副本红点修改提交
|
2020-08-31 13:58:47 +08:00 |
zhangqiang
|
e75adfa009
|
图鉴添加天赋属性
|
2020-08-31 11:49:35 +08:00 |
zhangqiang
|
daf0f8bca7
|
装备界面战力计算修改
|
2020-08-31 11:03:16 +08:00 |
jiaoyangna
|
0806d1d497
|
在副本未开启时不显示红点
|
2020-08-31 10:39:56 +08:00 |
gaoxin
|
fc9a5341f0
|
屏幕适配方式改为按高度适配,修复点击特效位置错误的问题
|
2020-08-29 17:22:46 +08:00 |
ZhangBiao
|
bd810de402
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 18:37:24 +08:00 |
ZhangBiao
|
a2c8352e29
|
装备文字过长、仙缘宝箱优化、充值妖晶提示问题
|
2020-08-28 18:37:16 +08:00 |
jiaoyangna
|
6436392c8e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-29 17:36:42 +08:00 |
jiaoyangna
|
93602b9cfb
|
commit
|
2020-08-29 17:36:28 +08:00 |
jiaoyangna
|
4e74194195
|
【优化】图鉴,选中阵营页签后,查看神将信息,点击返回,应该固定在之前选中的页签上
|
2020-08-29 17:35:49 +08:00 |
ZhangBiao
|
a99aa6ef6e
|
还是红点检测
|
2020-08-28 17:29:38 +08:00 |
ZhangBiao
|
ccbf29ecf2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 16:35:17 +08:00 |
ZhangBiao
|
0c3b0e6326
|
车迟斗法副本界面红点
|
2020-08-28 16:35:08 +08:00 |
gaoxin
|
02ec865150
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 15:30:02 +08:00 |
jiaoyangna
|
dd1493ee90
|
【碎片显示】确认购买和碎片合成时,不显示碎片道具的属性和碎片边框
|
2020-08-29 15:14:09 +08:00 |
gaoxin
|
ad2ec00881
|
成长基金的显隐加入礼包是否存在的判断
|
2020-08-28 15:29:57 +08:00 |
jiaoyangna
|
bf09d96840
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 14:06:15 +08:00 |
jiaoyangna
|
8d6c2d3adf
|
【宝物】金币不足,一键合成没有合理提示
|
2020-08-28 14:06:08 +08:00 |
ZhangBiao
|
238aa19209
|
神将情报点击装备查看详情 报错修改
|
2020-08-28 14:01:34 +08:00 |
ZhangBiao
|
77b4b7d3c8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 13:48:20 +08:00 |
ZhangBiao
|
01fc7cae51
|
森罗幻境奖励红点
|
2020-08-28 13:48:09 +08:00 |
gaoxin
|
2d9d097d98
|
修复巅峰赛按钮时间显示0的问题
|
2020-08-28 12:08:23 +08:00 |
ZhangBiao
|
cdc5c07b84
|
天宫秘宝在副本界面的红点
|
2020-08-28 10:36:09 +08:00 |
ZhangBiao
|
4f64e56b95
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 10:19:03 +08:00 |
ZhangBiao
|
7c02e82218
|
森罗回春散bug修复
|
2020-08-28 10:14:46 +08:00 |
gaoxin
|
259e0a1209
|
祈福文字修改
|
2020-08-28 03:12:54 +08:00 |
gaoxin
|
5d03b4fea8
|
巅峰赛按钮当日五点开始显示
|
2020-08-28 01:24:32 +08:00 |
gaoxin
|
1452da3489
|
修复在地图中直接退出游戏,再进入游戏时部分功能提示在地图中的问题
|
2020-08-28 00:34:02 +08:00 |
gaoxin
|
0f5c4ad6d0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 00:24:12 +08:00 |
gaoxin
|
c933276cea
|
试炼增益添加滑动效果
|
2020-08-28 00:24:06 +08:00 |
jiaoyangna
|
cc32ffadec
|
hecheng
|
2020-08-28 00:15:32 +08:00 |
jiaoyangna
|
8e5e508494
|
置换 commit
|
2020-08-28 00:09:07 +08:00 |
gaoxin
|
e6c8e81c82
|
修复小游戏反复打开会报错的问题
|
2020-08-27 23:01:07 +08:00 |
jiaoyangna
|
efd5a46eed
|
大闹天宫死亡置换修改提交
|
2020-08-27 22:52:51 +08:00 |
ZhangBiao
|
d87f14b479
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 22:25:19 +08:00 |
ZhangBiao
|
013bed75d7
|
|
2020-08-27 22:25:10 +08:00 |
jiaoyangna
|
7aff7b3c5c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 22:23:09 +08:00 |
jiaoyangna
|
80f59d54f1
|
置换编队检测还原
|
2020-08-27 22:23:04 +08:00 |
ZhangBiao
|
fbbe8db26f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua
|
2020-08-27 22:11:02 +08:00 |
ZhangBiao
|
4a452addd1
|
天宫秘宝报错修改
|
2020-08-27 22:10:08 +08:00 |