zhangqiang
|
4f840d9463
|
【神将没有升级材料依旧会出现小红点】
|
2021-03-24 10:36:24 +08:00 |
wangzhenxing
|
57b3c1af9c
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-23 20:42:07 +08:00 |
wangzhenxing
|
d0a7ef39ca
|
【战斗】=============添加新灵兽技能逻辑 放逐和麒麟印记
|
2021-03-23 20:41:44 +08:00 |
jiaoyangna
|
a6e553e5aa
|
灵兽提交
(cherry picked from commit 3bd78655a2 )
|
2021-03-23 20:36:31 +08:00 |
gaoxin
|
56d7244740
|
【适配】修复部分界面在全面屏下显示不全的问题
|
2021-03-23 19:08:21 +08:00 |
gaoxin
|
2d407b0dae
|
【百宝斋】竞技场赛季过渡以后,去百宝斋里点击下方大页签可以正常进入逐胜商店并购买,但是切换 逐胜/公会,这种小页签 就提示赛季已结束不让进
|
2021-03-23 18:10:59 +08:00 |
gaoxin
|
689d19776c
|
【bug】修复升级神将立即关闭界面,再次打开界面时显示错误
|
2021-03-23 18:08:22 +08:00 |
gaoxin
|
cf6fc198bb
|
【养成】升级时,战力光效层级不正确
|
2021-03-23 17:59:12 +08:00 |
ZhangBiao
|
aa855b5fdd
|
【关卡】应该改成按钮
(cherry picked from commit f30186c57e )
|
2021-03-23 16:37:40 +08:00 |
gaoxin
|
ca85726e29
|
【bug】修复公会boss点击挑战再返回伤害列表不显示的问题
|
2021-03-22 19:50:34 +08:00 |
gaoxin
|
1e47fc310b
|
【公会】邀请,红包,副本文字显示修改
|
2021-03-22 16:24:45 +08:00 |
gaoxin
|
1e62d7eed0
|
【bug】修复好友列表不能滑动的问题
|
2021-03-18 12:04:46 +08:00 |
gaoxin
|
79bc5b3966
|
【bug】修复替换装备时按钮文字错误
|
2021-03-18 10:17:15 +08:00 |
gaoxin
|
68433c0ecd
|
【bug】点击替换装备,装备图标跟穿戴着的图标一样
|
2021-03-18 10:07:40 +08:00 |
gaoxin
|
268a51c519
|
【优化】优化lateUpdate,修复使用lateupdate报错时会使所有lateupdate失效的问题
|
2021-03-17 14:52:09 +08:00 |
gaoxin
|
7a611cc8b2
|
Merge remote-tracking branch 'origin/0功能/本周版本优化内容' into xma/dev
|
2021-03-17 14:41:31 +08:00 |
wangzhenxing
|
5fde5a4473
|
[战斗]=============被动191修改,buff图标叠加添加免疫和连接符
|
2021-03-16 20:25:24 +08:00 |
wangzhenxing
|
15ce997282
|
[战斗]=============被动225修改 增加最大血量客户端特殊处理
|
2021-03-16 15:56:10 +08:00 |
gaoxin
|
39a404ab41
|
【ios】引导战斗添加
|
2021-03-15 20:16:03 +08:00 |
ZhangBiao
|
749c219177
|
Merge branch 'xma/dev' into 0功能/本周版本优化内容
|
2021-03-15 10:39:41 +08:00 |
gaoxin
|
43c94a2c15
|
【充值】修改首充奖励规则
|
2021-03-15 10:38:24 +08:00 |
jiaoyangna
|
4e4dedec14
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-13 17:38:02 +08:00 |
jiaoyangna
|
f48ee539f6
|
修改提交
|
2021-03-13 17:37:59 +08:00 |
ZhangBiao
|
17a9550df8
|
【首领来袭】
|
2021-03-13 15:52:50 +08:00 |
jiaoyangna
|
b63d62c7f1
|
文字修改提交
|
2021-03-13 14:25:25 +08:00 |
jiaoyangna
|
b260a2d0d8
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-13 14:22:54 +08:00 |
jiaoyangna
|
c7860fec99
|
文字修改提交
|
2021-03-13 14:22:48 +08:00 |
ZhangBiao
|
a9d26fb31e
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-13 14:01:04 +08:00 |
ZhangBiao
|
e9cadb6cb9
|
重登确认框
|
2021-03-13 14:00:27 +08:00 |
jiaoyangna
|
ea095efbfd
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-13 13:57:50 +08:00 |
jiaoyangna
|
8eec6650f2
|
图片提交
|
2021-03-13 13:57:42 +08:00 |
ZhangBiao
|
0779a816e0
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-13 12:57:41 +08:00 |
ZhangBiao
|
5334a7c7da
|
【首领来袭】
|
2021-03-13 12:57:31 +08:00 |
jiaoyangna
|
8656408ac9
|
宝箱状态修改
|
2021-03-12 18:18:25 +08:00 |
jiaoyangna
|
388f68d39d
|
鸿蒙提示修改
|
2021-03-12 17:28:10 +08:00 |
jiaoyangna
|
446d9c85ea
|
添加妖晶不足提示
|
2021-03-12 17:24:24 +08:00 |
jiaoyangna
|
5ed4d34201
|
合并修改提交
|
2021-03-12 17:08:51 +08:00 |
jiaoyangna
|
aa94edf1d7
|
Merge branch 'xma/dev' into 0功能/本周版本优化内容
|
2021-03-12 16:41:18 +08:00 |
jiaoyangna
|
579f2806c3
|
竞技守卫名字修改提交
(cherry picked from commit d3efa809d8 )
|
2021-03-12 16:35:55 +08:00 |
jiaoyangna
|
fa64d90f08
|
社稷大点领取奖励后宝箱状态修改
(cherry picked from commit 7fe83b0cea )
|
2021-03-12 15:55:57 +08:00 |
jiaoyangna
|
5be52f6b33
|
限时活动提交
(cherry picked from commit e3460c8b83 )
|
2021-03-12 15:48:29 +08:00 |
ZhangBiao
|
4f326e59e5
|
【本地化】战力排名弹窗,弹窗中无玩家排名,排名未刷新
|
2021-03-12 15:10:55 +08:00 |
ZhangBiao
|
51c0b51a87
|
【本地化】魂灵宝处需要修改
|
2021-03-12 15:07:17 +08:00 |
jiaoyangna
|
7b5cc295e8
|
文字提交
|
2021-03-12 14:32:45 +08:00 |
jiaoyangna
|
838de7cd1c
|
文字提交
|
2021-03-12 14:31:52 +08:00 |
jiaoyangna
|
dd706075d2
|
Merge branch 'xma/dev' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
# Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
|
2021-03-12 14:30:10 +08:00 |
jiaoyangna
|
8430af12af
|
文字提交
|
2021-03-12 14:24:41 +08:00 |
jiaoyangna
|
1cd3d4cdaa
|
文字提交
|
2021-03-12 14:20:14 +08:00 |
jiaoyangna
|
decb1e6ff0
|
图片提交
|
2021-03-12 14:13:42 +08:00 |
jiaoyangna
|
2a6a2e69da
|
图片提交,巅峰赛竞技守卫名字提交
|
2021-03-12 12:08:24 +08:00 |