Commit Graph

9220 Commits (e33fad0054683519661f8ec4d4bc20307038593b)
 

Author SHA1 Message Date
jiaoyangna ce674fc2ab 推送礼包文案修改 2021-09-09 17:31:25 +08:00
wangzhenxing 48e25d05e7 Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道 2021-09-09 16:47:34 +08:00
wangzhenxing 21a222cb27 aaaaaaaa 2021-09-09 16:47:18 +08:00
gaoxin 1094c3678a Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道 2021-09-09 16:40:34 +08:00
gaoxin b29d7b43fe 【玉虚】每日挑战奖励显示优化 2021-09-09 16:40:29 +08:00
wangzhenxing ea457002be Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道 2021-09-09 16:27:53 +08:00
wangzhenxing c27379226c aaaaaaaaaaaaa 2021-09-09 16:27:36 +08:00
gaoxin b1c987b16f 【玉虚】界面显示优化,星星显示优化 2021-09-09 16:22:35 +08:00
wangzhenxing 49a7a2b242 Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道 2021-09-09 15:44:33 +08:00
wangzhenxing 0d82056bc2 主界面显示修改 2021-09-09 15:44:19 +08:00
gaoxin 065734184e 【玉虚】商店跳转添加 2021-09-09 15:16:41 +08:00
jiaoyangna fd29cae402 界面销毁时删除红点绑定 2021-09-09 14:27:38 +08:00
gaoxin 60b842e2ab 【排行榜】报错修复 2021-09-09 14:05:44 +08:00
jiaoyangna d010e309ca 建木神树 升级修改提交 2021-09-09 14:03:14 +08:00
wangzhenxing a58b5f2d88 玉虚论道提交 2021-09-09 11:48:09 +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
ZhangBiao 1fefbb43e6 【七界试炼】提交 2021-09-09 11:10:43 +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
ZhangBiao b05227f79e 【七界试炼】提交 2021-09-08 17:32:48 +08:00
ZhangBiao 2fe984719b 【七界试炼】遗物1/2 2021-09-08 16:26:40 +08:00
ZhangBiao 6ec532f769 【七界试炼】排行奖励 2021-09-08 14:36:37 +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
ZhangBiao 1693300255 【七界试炼】目标特性 2021-09-08 10:06:24 +08:00
zhangshanxue 3ea9b7740b Merge branch 'china/test' into china/xq 2021-09-07 19:49:11 +08:00
jiaoyangna 3f740565cb 商店购买灵兽不弹恭喜获得修改 2021-09-07 19:44:37 +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
ZhangBiao ea1b521143 【七界试炼】提交 2021-09-07 19:27:05 +08:00
ZhangBiao adb77b501e Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-09-07 19:26:13 +08:00