gaoxin
|
b26cbe30ae
|
【奖励界面】修复部分奖励界面显示异常的问题
|
2021-09-15 10:24:57 +08:00 |
gaoxin
|
ec14782e3f
|
【红点】没删干净
|
2021-09-14 17:40:37 +08:00 |
gaoxin
|
fcc1e17cad
|
【红点】无用红点绑定事件删除
|
2021-09-14 17:37:44 +08:00 |
ZhangBiao
|
120be3af6f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-14 17:32:20 +08:00 |
ZhangBiao
|
fa5446d6d2
|
【鸿蒙阵】跨天英雄等级为0修复
|
2021-09-14 17:32:06 +08:00 |
gaoxin
|
12562b2ae2
|
【锻器阁】修复宝物详细打开两次显示异常
|
2021-09-14 16:56:33 +08:00 |
wangzhenxing
|
982e0c5268
|
【战斗】=======被动56修改
|
2021-09-13 20:17:37 +08:00 |
wangzhenxing
|
b468cb6164
|
[战斗]============被动56修改 boss免疫额外生命百分比伤害
|
2021-09-13 19:43:13 +08:00 |
jiaoyangna
|
8d59f41e34
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-13 18:46:53 +08:00 |
jiaoyangna
|
828538d28a
|
精炼等级描述修改提交
|
2021-09-13 18:46:41 +08:00 |
ZhangBiao
|
6bbb40171e
|
【十绝阵】点击一次挑战,挑战两次,尝试修改
|
2021-09-13 18:37:44 +08:00 |
jiaoyangna
|
cb6c480956
|
宝物强化界面消耗本体去掉加号
|
2021-09-13 17:30:01 +08:00 |
jiaoyangna
|
d55dd4c59d
|
共鸣宝物报错强化修改提交
|
2021-09-13 16:17:38 +08:00 |
jiaoyangna
|
7cff74a295
|
无尽秘宝激活错误修改提交
|
2021-09-13 14:11:02 +08:00 |
jiaoyangna
|
f37eec36e3
|
推送礼包文字描述修改提交
|
2021-09-11 17:27:15 +08:00 |
jiaoyangna
|
3ec8e9ee31
|
去掉空格
|
2021-09-11 17:21:38 +08:00 |
jiaoyangna
|
0a955034c7
|
【ID1018447】
【送神祠】阵营筛选的选中框资源错误
|
2021-09-11 17:19:37 +08:00 |
jiaoyangna
|
4e74731a43
|
【ID1018450】
【无尽副本】一键上阵会上阵空血神将
|
2021-09-11 17:11:39 +08:00 |
jiaoyangna
|
c98f2c1f02
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua
|
2021-09-11 17:06:01 +08:00 |
jiaoyangna
|
d41a0adeb1
|
推送礼包文案修改提交
|
2021-09-11 17:04:32 +08:00 |
wangzhenxing
|
79778b6eec
|
【战斗】===========被动261 修改
|
2021-09-11 16:04:06 +08:00 |
gaoxin
|
badf72a6f8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-11 15:22:55 +08:00 |
jiaoyangna
|
f49634a6fb
|
【ID1018456】
【新推送礼包】礼包文案需要修改
|
2021-09-11 15:18:47 +08:00 |
gaoxin
|
1c6599c17a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-11 15:13:02 +08:00 |
jiaoyangna
|
14559c4d6a
|
【ID1018450】
【无尽副本】一键上阵会上阵空血神将
|
2021-09-11 14:38:12 +08:00 |
gaoxin
|
ad182335d9
|
【推送礼包】名称修改
|
2021-09-10 19:52:14 +08:00 |
gaoxin
|
81421a2e49
|
【推送礼包】文字错误修改
|
2021-09-10 19:52:08 +08:00 |
gaoxin
|
10783ed104
|
【推送礼包】配置错误
|
2021-09-10 18:27:39 +08:00 |
gaoxin
|
eaf36b56ca
|
Revert "【礼包拍脸】修复报错"
This reverts commit 7bfa26d144 .
|
2021-09-10 17:56:53 +08:00 |
gaoxin
|
7bfa26d144
|
【礼包拍脸】修复报错
|
2021-09-10 16:44:17 +08:00 |
jiaoyangna
|
c5fc2ddedb
|
推送礼包修改提交
|
2021-09-09 18:11:37 +08:00 |
jiaoyangna
|
ce674fc2ab
|
推送礼包文案修改
|
2021-09-09 17:31:25 +08:00 |
jiaoyangna
|
fd29cae402
|
界面销毁时删除红点绑定
|
2021-09-09 14:27:38 +08:00 |
jiaoyangna
|
d010e309ca
|
建木神树 升级修改提交
|
2021-09-09 14:03:14 +08:00 |
gaoxin
|
3e3d0d9416
|
Merge remote-tracking branch 'origin/china/xq' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-09-09 11:22:47 +08:00 |
gaoxin
|
5d739f1291
|
【十绝阵】排行滑动数据错乱
|
2021-09-09 11:19:11 +08:00 |
jiaoyangna
|
4727998055
|
没有图片问题修改
(cherry picked from commit 76d8399ac9ecd0c999ed6e8b53c7b7e231b73a16)
|
2021-09-09 10:55:42 +08:00 |
gaoxin
|
77ea33d675
|
【商店】从其他界面返回时刷新显示
|
2021-09-09 10:50:03 +08:00 |
gaoxin
|
f4d0afde52
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-09 10:45:45 +08:00 |
gaoxin
|
5e938b5141
|
【巅峰赛】选拔赛组界面添加角色信息展示-修复查看编队是主线编队的问题
|
2021-09-09 10:45:40 +08:00 |
jiaoyangna
|
f07b92346a
|
www下载错误卡死修改
(cherry picked from commit 8c146837d826d97820a4eef73f1a125bf448dd39)
|
2021-09-09 10:43:08 +08:00 |
jiaoyangna
|
ef469e7ce7
|
山河社稷图引导卡死修改
|
2021-09-08 19:02:34 +08:00 |
gaoxin
|
021de51a59
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-08 18:29:05 +08:00 |
gaoxin
|
29d1b095e5
|
【碎片详情】碎片详情添加灵兽和神将的查看-特殊碎片不显示查看按钮
|
2021-09-08 18:28:50 +08:00 |
gaoxin
|
992608f7a4
|
【无尽地图】部分事件未解绑
|
2021-09-08 18:27:44 +08:00 |
gaoxin
|
c4bced89f7
|
【战斗校验】山河社稷图,跨服战斗,地图战斗添加战斗校验
|
2021-09-08 18:27:20 +08:00 |
jiaoyangna
|
250683a822
|
山河社稷图引导卡死修改
|
2021-09-08 18:19:51 +08:00 |
jiaoyangna
|
7abd0955e2
|
【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
|
2021-09-08 12:19:59 +08:00 |
jiaoyangna
|
1757b3cad7
|
好友宝物修改提交
|
2021-09-08 12:00:34 +08:00 |
jiaoyangna
|
b1b0bf1cab
|
【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
|
2021-09-08 11:11:30 +08:00 |