Commit Graph

8240 Commits (ad64dfd00943a42f53fe8a6dafe4c63db1f734f1)

Author SHA1 Message Date
yuanshuai c8196dedd7 化身之力红点bug修改 2022-04-27 15:46:08 +08:00
yuanshuai ba1d2ebd94 魂印引导修改 2022-04-27 15:24:50 +08:00
yuanshuai 085c7add9f 魂印合成引导 2022-04-27 14:41:54 +08:00
yuanshuai b5246024d0 化身卡详情界面修改 2022-04-27 10:33:49 +08:00
yuanshuai bce1445a77 神印商店红点添加 2022-04-26 19:08:26 +08:00
yuanshuai 44804a9a4d 漏提交 2022-04-26 18:52:19 +08:00
yuanshuai b86a00b275 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-26 18:28:56 +08:00
yuanshuai 81a671e0f1 化身升级bug修改 2022-04-26 18:28:37 +08:00
wangzhenxing ddd2a0c024 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-26 18:26:20 +08:00
wangzhenxing 34685c7cb8 bug修改 2022-04-26 18:25:57 +08:00
yuanshuai 732f92a6fa 跨服排行榜页签修改 2022-04-26 17:48:46 +08:00
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 8a7c4160f0 背包页签修改 2022-04-26 11:56:20 +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 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
yuanshuai 160d974cbc 变身卡界面调整提交 2022-04-24 22:13:28 +08:00
wangzhenxing aad7541dbd 挑战副本不显示倒计时 2022-04-24 21:31:49 +08:00
yuanshuai 9ec3724c5d 身外化身界面调整 2022-04-24 20:27:05 +08:00
yuanshuai 882f77e164 界面修改 2022-04-24 19:46:59 +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
yuanshuai c3919b7e82 变身卡强化相关代码提交 2022-04-22 18:24:33 +08:00
wangzhenxing ca2b699259 神印提交 2022-04-22 18:23:01 +08:00
wangzhenxing e025824de6 添加报错处理 2022-04-22 13:17:58 +08:00
yuanshuai d247989586 挑战副本bug修改 2022-04-21 18:43:24 +08:00
wangzhenxing 61a52f4239 [变身卡]=======处理变身卡报错 2022-04-21 17:23:57 +08:00
yuanshuai dc8704a806 探索商店跳转入口添加 2022-04-28 10:48:08 +08:00
yuanshuai bf52645eb7 挑战副本优化 2022-04-25 18:20:53 +08:00
yuanshuai 5217d75b41 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-20 13:23:25 +08:00
yuanshuai 50683260c7 挑战副本红点提交 2022-04-20 13:23:08 +08:00
wangzhenxing ba45227ed1 [战斗]======去掉log 2022-04-20 13:22:26 +08:00
wangzhenxing 0cad07009a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-19 17:24:53 +08:00
wangzhenxing 53e7c44e2a [战斗]=======战斗提交 2022-04-19 17:23:37 +08:00
yuanshuai 804b2c3f4d 挑战副本bug修改 2022-04-19 16:50:03 +08:00
yuanshuai 3c72cd688b 挑战副本bug修改 2022-04-19 16:14:55 +08:00
yuanshuai 24bf6c63e4 挑战副本脚本修改 2022-04-19 15:52:50 +08:00
yuanshuai b907383826 挑战副本脚本修改 2022-04-19 11:53:08 +08:00
yuanshuai b4a626d9e2 挑战副本脚本修改提交 2022-04-18 18:48:06 +08:00
yuanshuai f8f14d06e9 挑战副本修改 2022-04-18 00:03:41 +08:00
yuanshuai bd3bed7e41 挑战副本脚本提交 2022-04-15 11:48:52 +08:00
yuanshuai 9ebdab46b3 挑战副本相关脚本提交 2022-04-14 16:07:45 +08:00
wangzhenxing 2ed317bc2c 摘星阁修改,备战阵营图标显示修改 2022-04-07 15:09:04 +08:00
wangzhenxing 5afe0f400b 洞府装备加成显示修改 2022-04-07 11:45:51 +08:00
wangzhenxing abd83b945a 【bug】======英雄升星属性显示修改 2022-04-07 10:33:55 +08:00
wangzhenxing 9d772eab4c 【bug】=====心魔助战英雄修改 2022-04-06 16:21:34 +08:00
wangzhenxing 50c78ef888 【bug】======转换职业后卸下魂宝 2022-04-06 14:15:36 +08:00
wangzhenxing e0ec7f2dec [bug]====英雄信息修改 2022-04-02 17:47:30 +08:00
wangzhenxing 0a52e4a549 [bug]=====神系英雄修改提交 2022-04-02 16:03:18 +08:00
jiaoyangna 17f855be9f 【ID1011382】
进阶好礼
2022-04-02 15:43:29 +08:00
jiaoyangna bfdc6d72b9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-02 14:45:36 +08:00
jiaoyangna 7a1ccac3cd 【ID1011398】
山河设计图每日玉衡龙魂丹领取调整
2022-04-02 14:45:12 +08:00
wangzhenxing 3c1986c71c 【神魂】=====神魂升级屏蔽神系转换职业的英雄 2022-04-01 18:41:10 +08:00
wangzhenxing 9a2f342ef7 【功能】======寻仙招募优化 2022-04-01 17:10:37 +08:00
wangzhenxing e9219317e2 【bug】=====森罗幻境修改 2022-04-01 16:01:36 +08:00
wangzhenxing f44f70085b 【bug】=====七界阵容条件修改 2022-04-01 15:09:57 +08:00
wangzhenxing a3e166a05e 【bug】=====英雄列表排序修改 2022-03-31 18:11:08 +08:00
wangzhenxing 88d80be02b 【bug】============神系转换职业修改 2022-03-31 17:25:43 +08:00
wangzhenxing 6d7dcce74f [bug]======无尽副本编对界面修改 2022-03-31 16:00:27 +08:00
wangzhenxing 764f61cfb2 [bug]=====飞升界面英雄临时数据修改 2022-03-31 14:29:25 +08:00
wangzhenxing eff2800c35 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-31 09:51:26 +08:00
wangzhenxing 3e625b9fd0 [功能]=======英雄合成,英雄置换修改提交 2022-03-31 09:51:10 +08:00
wangzhenxing 24a92b6b98 [战斗]=======被动387修改 2022-03-30 17:12:03 +08:00
jiaoyangna 4252fde78f 【ID1011380】
装备和宝石属性修正

(cherry picked from commit 2f54afd172d5da2223cd5e5f8a5cc26b430985ae)
2022-03-30 13:40:37 +08:00
jiaoyangna 82dd52e57c 红点修改提交 2022-03-29 16:41:19 +08:00
jiaoyangna f1bcffd06f 红点修改提交 2022-03-29 16:31:20 +08:00
jiaoyangna 701938ad27 【ID1011391】
飞升鸿蒙阵等级限制调整

(cherry picked from commit 0f69eb822293597556fe825a6b9f99d27b8d8f91)
2022-03-29 16:25:49 +08:00
wangzhenxing 9f2b6a80b5 [功能]=======命石显示修改 2022-03-29 15:49:54 +08:00
wangzhenxing 57812ad22f [功能]=======命石修改,建木神树修改 2022-03-29 15:28:56 +08:00
jiaoyangna bbde58e666 【ID1011387】
战力冲刺有奖励可领取时增加红点提示

(cherry picked from commit d2773bab9e7c632f68f26b3829eb495296654761)
2022-03-29 14:03:42 +08:00