Commit Graph

12465 Commits (311439c88563ebd6faab89db1f1ffd6ade601d4c)
 

Author SHA1 Message Date
yuanshuai 311439c885 【天宫商店】去掉已获得变身卡的购买限制 2022-04-26 17:26:55 +08:00
yuanshuai 4199ea504a 查看其他玩家信息,变身卡信息不对bug 2022-04-26 17:20:19 +08:00
wangzhenxing 81122369c6 bug修改提交 2022-04-26 16:09:21 +08:00
yuanshuai 2b5830b76a 物品弹窗bug修改 2022-04-26 15:36:43 +08:00
wangzhenxing b5445b2ed6 神印bug修改 2022-04-26 15:03:06 +08:00
yuanshuai 750b243bb9 化身之力红点bug修改 2022-04-26 14:47:04 +08:00
wangzhenxing 2ba97e8fe2 英雄神印入口修改 2022-04-26 14:22:35 +08:00
yuanshuai f187acdf52 化身属性显示不对bug修改 2022-04-26 14:21:24 +08:00
yuanshuai f65ddb2eda 化身卡升星bug修改 2022-04-26 13:44:19 +08:00
yuanshuai 0c3dec451f 化身bug修改 2022-04-26 13:33:41 +08:00
yuanshuai b1cf666e41 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-26 11:56:51 +08:00
yuanshuai 8a7c4160f0 背包页签修改 2022-04-26 11:56:20 +08:00
wangzhenxing 364cc676c1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-26 11:52:46 +08:00
wangzhenxing 84f96972ce 预设修改提交 2022-04-26 11:51:51 +08:00
yuanshuai f0cb395539 背包页签修改 2022-04-26 11:45:13 +08:00
wangzhenxing 1f37ce3b4e 【战斗】========被动438修改 2022-04-26 11:14:49 +08:00
yuanshuai 92e56472de 天宫商店点击报错 bug修改 2022-04-26 10:14:52 +08:00
wangzhenxing d3a8722b95 图鉴修改 2022-04-25 20:35:17 +08:00
wangzhenxing 139a2de8d2 背包描述修改 2022-04-25 20:06:16 +08:00
wangzhenxing adef176142 [战斗]======被动304修改 2022-04-25 20:03:44 +08:00
yuanshuai 868eb69aa6 挑战副本bug修改 2022-04-25 19:33:11 +08:00
yuanshuai fd6f30e459 挑战副本bug修改 2022-04-25 18:56:48 +08:00
yuanshuai 626a2a98ef 化身bug修改 2022-04-25 18:48:27 +08:00
yuanshuai 565d4007df 化身之力界面调整 2022-04-25 18:42:19 +08:00
yuanshuai e4e244d36b 化身界面修改 2022-04-25 18:03:37 +08:00
yuanshuai 55833325bf 跨服相关修改 2022-04-25 17:57:31 +08:00
yuanshuai 21342783bd 化身卡界面修改 2022-04-25 16:23:41 +08:00
yuanshuai 7c543952e5 身外化身界面修改 2022-04-25 15:52:46 +08:00
yuanshuai 4e5ccff820 身外化身界面调整 2022-04-25 14:42:17 +08:00
wangzhenxing e0263ea164 添加神印笔跳转 2022-04-25 13:43:46 +08:00
yuanshuai dcf1e29c3a 界面优化 2022-04-25 11:52:09 +08:00
wangzhenxing 4b9d210499 屏蔽神阵营,屏蔽招募 2022-04-25 11:31:32 +08:00
luyao 1a84c8e5ad 神印商店店名图标上传 2022-04-25 10:55:19 +08:00
yuanshuai 160d974cbc 变身卡界面调整提交 2022-04-24 22:13:28 +08:00
wangzhenxing aad7541dbd 挑战副本不显示倒计时 2022-04-24 21:31:49 +08:00
wangzhenxing 3678f78c75 神印币添加跳转 2022-04-24 21:26:32 +08:00
yuanshuai 5f40aab195 图片修改 2022-04-24 20:33:30 +08:00
yuanshuai 9ec3724c5d 身外化身界面调整 2022-04-24 20:27:05 +08:00
yuanshuai 882f77e164 界面修改 2022-04-24 19:46:59 +08:00
luyao a1fa271959 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-24 19:02:19 +08:00
luyao f82f6cbbd9 神印、挑战副本预告图标 2022-04-24 19:01:36 +08:00
wangzhenxing 4792186f71 天书密卷屏蔽 装备篇 2022-04-24 18:32:44 +08:00
wangzhenxing 4fb96bca23 结算界面特效穿透问题修改 2022-04-24 18:27:53 +08:00
wangzhenxing 043f174f08 神印开始条件显示 2022-04-24 17:19:34 +08:00
yuanshuai 26970aee68 身外化身功能提交 2022-04-24 16:50:24 +08:00
wangzhenxing e498661919 神印添加背包分解 2022-04-24 16:36:27 +08:00
wangzhenxing 7cdf302e90 神印修改提交 2022-04-24 14:20:11 +08:00
wangzhenxing fed9afed62 [战斗]======目标选择逻辑添加空判断 2022-04-24 11:38:41 +08:00
yuanshuai 1114c62c97 添加一键放入 2022-04-22 19:29:10 +08:00
yuanshuai 765134f4b3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua
2022-04-22 18:33:04 +08:00