Commit Graph

8936 Commits (f6315ac326cc2b00eca02e248119e65cd38cdcc7)

Author SHA1 Message Date
wangzhenxing 396ca1a425 [洞府]=======洞府特权修改 2022-06-10 14:42:35 +08:00
yuanshuai 38f1ba32c4 签到bug修改 2022-06-10 14:04:23 +08:00
yuanshuai 783298b7b2 周卡再领一次资源提交 2022-06-10 13:15:27 +08:00
yuanshuai 3b8922d9f7 Merge branch '0功能/周卡月卡' into china/dev 2022-06-10 11:24:15 +08:00
yuanshuai 22bafa91fa 周卡月卡调整 2022-06-09 18:04:44 +08:00
yuanshuai af1452a76a 提示文字修改 2022-06-09 17:39:57 +08:00
yuanshuai a74690a384 周卡月卡界面调整 2022-06-09 17:10:07 +08:00
wangzhenxing df6eafad47 Merge branch 'china/dev' into china/test 2022-06-09 16:01:09 +08:00
wangzhenxing ee3fecc198 [主题活动累充有礼]=====红点修改 2022-06-09 15:51:44 +08:00
yuanshuai 2d18090df7 周卡月卡脚本预设提交 2022-06-09 14:19:07 +08:00
wangzhenxing 7c34cec6f3 [抽卡]=====宝箱名字修改 2022-06-09 13:57:12 +08:00
wangzhenxing f6d3a8c0d7 Merge branch 'china/dev' into china/test 2022-06-08 18:41:53 +08:00
wangzhenxing d5be125722 【抽卡】=======抽卡宝箱描述修改 2022-06-08 18:14:25 +08:00
wangzhenxing 35fe308aaa [抽卡]======仙缘箱开始展示修改 2022-06-08 17:15:25 +08:00
wangzhenxing 547a56b2a9 [首充]======首充修改 2022-06-08 15:35:52 +08:00
wangzhenxing 2e85ea786f [探索]========探索入口代码屏蔽 2022-06-08 14:25:41 +08:00
wangzhenxing 51eb81d46c [周卡]======周卡修改提交 2022-06-08 10:08:31 +08:00
wangzhenxing b878a0a1a4 [剧情]=====屏蔽解开孙悟空封印剧情 2022-06-07 17:43:47 +08:00
wangzhenxing 0086c01ff6 [首充]======首充修改提交 2022-06-07 15:48:54 +08:00
wangzhenxing 9eb6f8fb4e [英雄信息]=====背景修改 2022-06-06 16:14:29 +08:00
wangzhenxing 6bc4adee78 [英雄信息界面]=====背景修改 2022-06-06 15:43:15 +08:00
wangzhenxing ec1933de1d [战斗]========被动439提交 2022-06-06 14:39:53 +08:00
wangzhenxing dd7a256469 [周卡]======红点修改提交 2022-06-01 14:50:08 +08:00
wangzhenxing 054c31caee [周卡]=====红点提交 2022-06-01 13:23:34 +08:00
wangzhenxing 6925105782 [周卡]======周卡提交 2022-06-01 09:34:41 +08:00
wangzhenxing b1bf334a58 [聊天]========报错修改提交 2022-05-30 14:59:16 +08:00
wangzhenxing 36171c45e6 Merge branch 'china/dev' into china/test 2022-05-26 12:03:56 +08:00
wangzhenxing a2cab243fc 【专属升星】======选择英雄界面报错修改 2022-05-26 11:14:13 +08:00
wangzhenxing 25683d637e Merge branch 'china/dev' into china/test 2022-05-25 17:24:34 +08:00
wangzhenxing 1c715438c8 [玉虚论道]=======开战添加相同神将屏蔽提示 2022-05-25 13:58:31 +08:00
wangzhenxing 4c259df154 [公会boss]=====刷新次数修改 2022-05-24 15:12:44 +08:00
wangzhenxing f4545f127c 战斗表现修改 2022-05-24 14:09:01 +08:00
wangzhenxing bbd485f56f [假战斗]=====修改 2022-05-24 13:35:24 +08:00
wangzhenxing 3e75dc9f6f [假战斗]======修改提交 2022-05-24 11:57:47 +08:00
wangzhenxing e509483e41 [寻仙招募]=====预设修改 2022-05-23 15:30:58 +08:00
wangzhenxing a97ccb19e6 [图鉴]=====展示英雄法宝 2022-05-23 11:36:50 +08:00
wangzhenxing e7df09c284 [寻仙招募]======修改提交 2022-05-23 11:29:10 +08:00
wangzhenxing 9eaabc293d Merge branch 'china/dev' into china/test 2022-05-20 13:07:27 +08:00
wangzhenxing ad64dfd009 [引导]======神印引导修改提交 2022-05-20 11:16:54 +08:00
wangzhenxing 27ea9fd92c 查看他人英雄技能修改提交 2022-05-19 22:24:02 +08:00
wangzhenxing d1970ed6cc 他人英雄详情修改 2022-05-19 22:12:14 +08:00
wangzhenxing 5e27a00173 英雄技能详情修改 2022-05-19 21:33:38 +08:00
wangzhenxing 6c902c649b [首充]=====求掉显示10星属性按钮 2022-05-19 21:13:08 +08:00
wangzhenxing d97c84a543 [英雄详情修改i] 2022-05-19 20:43:41 +08:00
wangzhenxing 588df24b29 角色信息界面技能标签修改 2022-05-19 19:04:21 +08:00
wangzhenxing 4c4fa444ab [英雄技能]====英雄技能显示修改 2022-05-19 18:50:16 +08:00
wangzhenxing fc497645d2 [bug]=======招募基金报错修改 2022-05-19 17:30:26 +08:00
wangzhenxing 3b4e771d16 [神将信息展示]======神将信息修改 2022-05-19 16:38:52 +08:00
yuanshuai 0cad7e593a 终身卡调整 2022-05-21 14:19:59 +08:00
yuanshuai 434cba5cc2 终身卡脚本预设提交 2022-05-19 11:49:56 +08:00
yuanshuai 064407ea0f 终身卡修改提交 2022-05-19 11:29:08 +08:00
wangzhenxing e2e9897796 Merge branch 'china/dev' into china/test 2022-05-09 18:44:40 +08:00
yuanshuai b8308b380c 开服福利奖励修改 2022-05-09 18:31:41 +08:00
wangzhenxing 685d475f2e 抽卡宝箱描述修改 2022-05-09 18:04:06 +08:00
wangzhenxing eea07aea59 副本入口未开启提示修改 2022-05-09 14:37:50 +08:00
yuanshuai 1cc81367e3 Merge branch '0功能/山河社稷图分页' into china/dev 2022-05-09 14:09:41 +08:00
wangzhenxing 97d96d07c0 仙缘汇聚箱描述修改 2022-05-09 14:02:31 +08:00
wangzhenxing a6f1b4b53f 【神印】=====圆圈品质框i修改 2022-05-06 22:28:25 +08:00
yuanshuai eca9a7d052 漏提交 2022-05-05 17:16:30 +08:00
yuanshuai 1e6d693209 山河设计图分页请求修改 2022-05-05 16:46:33 +08:00
wangzhenxing 66134423f3 Merge branch 'china/dev' into china/test 2022-05-05 12:17:35 +08:00
wangzhenxing 4ef723e229 [神印]====显示修改 2022-05-05 11:52:48 +08:00
wangzhenxing 33f5ae02db 神印修改 2022-04-29 18:36:20 +08:00
wangzhenxing 3ebe1d8d04 Merge branch 'china/dev' into china/test 2022-04-29 18:14:47 +08:00
wangzhenxing 374d5d8d98 shenyin 修改 2022-04-29 18:13:00 +08:00
wangzhenxing 679d63bc63 Merge branch 'china/dev' into china/test 2022-04-29 13:40:23 +08:00
yuanshuai 25515c21b7 关卡奖励报错修改 2022-04-29 11:48:39 +08:00
yuanshuai 9e43668f82 修行引导屏蔽 2022-04-28 18:06:27 +08:00
yuanshuai 9e0e197a2b 商店代币页签红点修改 2022-04-28 17:12:25 +08:00
yuanshuai e8efc2e7e6 跨服战界面膜拜按钮调整 2022-04-28 16:49:18 +08:00
yuanshuai 99ae5cb8ec 探索界面保存编队逻辑优化 2022-04-28 16:12:33 +08:00
wangzhenxing c3a9077c3c Merge branch 'china/dev' into china/test 2022-04-28 15:09:19 +08:00
yuanshuai 4e70fc5113 限时活动红点修改 2022-04-28 14:26:35 +08:00
wangzhenxing 6606b6bc64 56级宝物显示在背包 2022-04-28 13:46:14 +08:00
yuanshuai 0805e5054d 身外化身界面调整 2022-04-28 11:58:48 +08:00
wangzhenxing 9716d0d90e 神印红点修改提交 2022-04-28 10:51:39 +08:00
yuanshuai a53c0446b8 化身之力bug修改 2022-04-28 10:45:25 +08:00
yuanshuai 72127689d0 修复修行技能点击卡顿问题 2022-04-28 10:35:48 +08:00
wangzhenxing 9300f5a08d 修行小圆图标修改提交 2022-04-27 18:25:53 +08:00
yuanshuai e9c2c5ffdc 挑战副本时间隐藏 2022-04-27 18:15:29 +08:00
yuanshuai d1111be7eb 化身卡升级升星红点提交 2022-04-27 18:08:55 +08:00
wangzhenxing 16d6e211a3 神印四灵显示修改 2022-04-27 17:14:20 +08:00
yuanshuai c8196dedd7 化身之力红点bug修改 2022-04-27 15:46:08 +08:00
yuanshuai ba1d2ebd94 魂印引导修改 2022-04-27 15:24:50 +08:00
yuanshuai 080f04ebbe 变身卡商店bug修改 2022-04-27 14:50:59 +08:00
yuanshuai 085c7add9f 魂印合成引导 2022-04-27 14:41:54 +08:00
wangzhenxing f2d7042064 Merge branch 'china/dev' into china/test 2022-04-27 13:50:04 +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 7de86a79eb Merge branch 'china/dev' into china/test 2022-04-25 13:51:38 +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
wangzhenxing 3678f78c75 神印币添加跳转 2022-04-24 21:26:32 +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
wangzhenxing f49bb38f8f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-20 16:20:41 +08:00
wangzhenxing 3021107155 globaldefine提交 2022-04-20 16:20:24 +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