Commit Graph

7914 Commits (3f24f4cd86cc3ed3e54d292fbc3556de7f5478c9)

Author SHA1 Message Date
ZhangBiao 1e17301cc8 【背包优化】宝物背包按照品质优先级进行排序,并增加阵营筛选功能 2021-09-16 16:16:50 +08:00
wangzhenxing 6ba0d264fd 【战斗】=========战斗界面预设 我方阵容适配修改提交 2021-09-16 16:13:55 +08:00
wangzhenxing fcd3213688 [战斗]========战斗界面我方灵兽位置修改 2021-09-16 15:02:14 +08:00
jiaoyangna 4e4a53d447 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-16 14:08:41 +08:00
jiaoyangna 415eb7a947 【寻宝迷踪】寻宝返回后默认返回显示活动第一个页签 2021-09-16 14:06:37 +08:00
ZhangBiao 537af282e6 【寻宝迷踪】提交 2021-09-16 14:05:07 +08:00
ZhangBiao f035b30e59 【寻宝迷踪】tip遮盖修改 2021-09-16 13:43:10 +08:00
ZhangBiao 95adcb6b1d Revert "【寻宝迷踪】修改提交"
This reverts commit 31304cc252.
2021-09-16 13:39:23 +08:00
ZhangBiao 31304cc252 【寻宝迷踪】修改提交 2021-09-16 13:25:15 +08:00
ZhangBiao d49d73dcb5 【寻宝迷踪】跳转提交 2021-09-15 19:14:18 +08:00
ZhangBiao faacb77b2e 【协议】meta提交 2021-09-15 15:34:48 +08:00
ZhangBiao 045134941d 【鸿蒙阵】协议 2021-09-15 15:19:38 +08:00
ZhangBiao 7dbb75741e 【协议 和 meta】 2021-09-15 15:06:31 +08:00
gaoxin 7462f02cfd Revert Revert 回滚错误的合并 4f19f12612 2021-09-15 14:29:14 +08:00
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
ZhangBiao 1de0eda8bd 【适配】觉醒1080*2550左下角“等级上限”文字被切 2021-09-13 20:02:05 +08:00
ZhangBiao 1251150a9e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-13 19:53:14 +08:00
ZhangBiao afa857f134 【灵兽优化】灵兽升星需求数字移动至ICON下方 2021-09-13 19:53:05 +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
gaoxin 7bce643c71 【尝试修复IOS不明原因报错】 2021-09-10 16:31:29 +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
liujiaqi 947a4fa368 【资源】织女技能字 2021-09-08 14:02:27 +08:00
luyao 150f6e0909 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/08,13:51:49 2021-09-08 13:51:49 +08:00
luyao b05a0b108d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-08 13:50:01 +08:00
luyao 9b71c0e53e bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/08,13:45:19 2021-09-08 13:45:19 +08:00
luyao 681d0be397 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/08,13:44:18 2021-09-08 13:44:18 +08:00
jiaoyangna 7abd0955e2 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-08 12:19:59 +08:00
jiaoyangna 1757b3cad7 好友宝物修改提交 2021-09-08 12:00:34 +08:00
jiaoyangna ed7c2d9d5e 装备界面修改 2021-09-08 11:45:04 +08:00
jiaoyangna c18094ff97 精炼等级位置修改 2021-09-08 11:37:37 +08:00
jiaoyangna b1b0bf1cab 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-08 11:11:30 +08:00
jiaoyangna a012ece114 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-08 10:27:26 +08:00
gaoxin d6961c19fe Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-07 19:43:34 +08:00
gaoxin 2a23609ed6 【战斗】添加缺失的方法 2021-09-07 19:43:08 +08:00
jiaoyangna 4fd5f70e5b 商店购买灵兽不弹恭喜获得修改
(cherry picked from commit 1cbd4a8965)
2021-09-07 19:17:13 +08:00
jiaoyangna 1cbd4a8965 商店购买灵兽不弹恭喜获得修改 2021-09-07 19:15:46 +08:00
luyao 2972a973c5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-07 19:00:24 +08:00
luyao 67326aa278 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/07,19:00:05 2021-09-07 19:00:05 +08:00
luyao 19551d50f9 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/07,18:46:08 2021-09-07 18:46:09 +08:00
gaoxin 2fa2fe0a28 【织女】live2d资源没有透明通道 2021-09-07 18:26:43 +08:00
zhangshanxue e4f65ba04b Merge branch 'china/test' into china/xq 2021-09-07 18:07:31 +08:00
gaoxin 8b57b7df1f 【逍遥游】西贺牛州选定区域优化 2021-09-07 15:42:05 +08:00
gaoxin 0bd0137a2b 【战斗】v1.0.57
1、尝试修复孙悟空大招不会增加伤害的问题
 2、添加用于debug的log
2021-09-07 15:14:10 +08:00
gaoxin 79832f3232 【碎片详情】碎片详情添加灵兽和神将的查看 2021-09-07 11:40:12 +08:00
gaoxin 19e83da85c 【资源】资源名重复 2021-09-07 10:27:34 +08:00
gaoxin b74d5ebf38 【资源】资源名重复 2021-09-07 10:27:09 +08:00
zhangshanxue c3dd7b40c4 Merge branch 'china/test' into china/xq 2021-09-06 19:24:18 +08:00
gaoxin 0febc6ae6a 【背包】修复滑动后切换页签不回到最顶部的 问题 2021-09-06 19:23:56 +08:00
gaoxin b5ad62620f 【背包】修复滑动后切换页签不回到最顶部的 问题 2021-09-06 19:23:41 +08:00
jiaoyangna 466bee75bd 四灵排行榜类型修改 2021-09-06 19:10:26 +08:00
gaoxin 17ebbc1872 【优化】灵兽商城商品上显示当前已有的灵兽碎片 2021-09-06 18:19:45 +08:00
gaoxin b953fac2a0 【巅峰赛】选拔赛组界面添加角色信息展示 2021-09-06 17:58:31 +08:00
zhangshanxue 053650b3e7 Merge branch 'china/test' into china/xq 2021-09-06 16:36:25 +08:00
gaoxin 34b09a565e Merge branch 'china/dev' into china/test 2021-09-06 16:36:04 +08:00
gaoxin 59ec0d6f20 【觉醒】修复会自动选择鸿蒙阵共鸣神将的问题 2021-09-06 16:35:46 +08:00
zhangshanxue 8c277426e5 【奖励】修复关闭界面时部分数据未还原 2021-09-06 13:55:12 +08:00