Commit Graph

8583 Commits (828e56c6be1c9c0e43677fc00cb3af9e1d2a27c9)

Author SHA1 Message Date
wangzhenxing 5535d7df71 [首充]=====首充修改 2022-07-12 18:25:50 +08:00
yuanshuai 5137eb1b8f 数字游戏日语提示修改 2022-07-12 15:27:34 +08:00
wangzhenxing b8f4784465 [首充]======首充跳转修改 2022-07-11 15:51:19 +08:00
yuanshuai 92b971ad82 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-07-11 15:43:11 +08:00
yuanshuai d952b9a44c 数字游戏模块提交 2022-07-11 15:43:04 +08:00
wangzhenxing 47f407fad6 [跳转]======添加跳转108类型 2022-07-11 15:21:28 +08:00
wangzhenxing 88a8113253 【抽卡】======开启心愿 2022-07-07 16:07:24 +08:00
wangzhenxing 6a76b1e168 【首充】=======拍脸修改提交 2022-07-07 10:57:34 +08:00
wangzhenxing 45be1705cc 【首充拍脸】=======无限拍脸修改 2022-07-07 10:46:38 +08:00
wangzhenxing eab0e11e44 Merge branch 'china/dev' into china/test 2022-07-06 14:33:03 +08:00
yuanshuai 6683285c95 商城箭头添加 2022-07-06 13:21:40 +08:00
yuanshuai 7f65810d70 宝箱添加点击详情 2022-07-06 11:40:35 +08:00
yuanshuai c7355221bd 缥缈之旅界面修改 2022-07-05 13:42:58 +08:00
wangzhenxing bb3f825aa9 【青龙秘宝】======奖励添加空判断 2022-07-04 18:43:22 +08:00
wangzhenxing 417fdfa650 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-07-04 18:08:34 +08:00
wangzhenxing 18660a1954 【青龙秘宝】=====添加空判断 2022-07-04 18:08:07 +08:00
yuanshuai 8b29c12d91 首充拍脸代码提交 2022-07-04 17:57:39 +08:00
wangzhenxing cc883eadff 【青龙秘宝】========购买秘宝等级报错修改 2022-07-04 17:55:34 +08:00
wangzhenxing 5051094bf6 [青龙秘宝]=======奖励配0报错修改 2022-07-04 17:09:37 +08:00
yuanshuai 5bda9d59a4 缥缈之旅修改 2022-07-04 16:38:07 +08:00
wangzhenxing d119bac1c0 【首充】========关卡首充显示修改 2022-07-01 14:43:08 +08:00
wangzhenxing 43e1913e37 [首充]=====首充按钮普通关卡大小调整 2022-06-30 18:27:53 +08:00
wangzhenxing d2df97df2a [首充]=======首充添加到普通关卡界面 2022-06-30 18:17:58 +08:00
wangzhenxing 812cfaabb6 [月卡]======月卡红点修改 2022-06-30 10:21:13 +08:00
wangzhenxing bf9efec5c6 [战斗]========战斗名称显示修改 2022-06-29 14:54:23 +08:00
wangzhenxing f0eadfcc1f Merge branch 'china/dev' into china/test 2022-06-21 15:26:56 +08:00
wangzhenxing 7f8dcf2416 [连冲返利]=====报错修改,名称敏感字符提示修改 2022-06-21 14:40:48 +08:00
wangzhenxing 5fe8fec06c [连冲返利]=======添加空判断 2022-06-21 13:31:59 +08:00
wangzhenxing a5f0dac30a [排行榜]======主程排行榜红点修改 2022-06-20 17:22:11 +08:00
wangzhenxing 88d574be95 【易经宝库】========一键挖宝修改 2022-06-20 16:24:02 +08:00
wangzhenxing 91bf4423f9 [主程排行榜]======排行榜红点,列表显示修改 2022-06-20 15:14:35 +08:00
wangzhenxing 5ec4ff9fd5 【易经宝库】=======添加一键挖宝功能 2022-06-20 14:08:32 +08:00
wangzhenxing 5885d46076 【超值连冲】=======显示6元页签及6元红点 2022-06-17 16:08:13 +08:00
wangzhenxing d796a106bc [超值连冲]========活动修改红点修改 2022-06-17 16:00:48 +08:00
wangzhenxing 2bab932602 Merge branch 'china/dev' into china/test 2022-06-15 15:07:55 +08:00
wangzhenxing e7eee5c2c3 【装备】=======神装合成修改提交 2022-06-15 13:52:15 +08:00
wangzhenxing 4c82f2d58c 【装备】======添加特效 2022-06-15 10:31:10 +08:00
wangzhenxing 1422c234d6 【装备合成】========装备神装页签添加红点 2022-06-14 18:50:04 +08:00
wangzhenxing 12e0c83271 【合成装备】=======套装属性显示修改 2022-06-14 17:59:20 +08:00
wangzhenxing 1cc17d4e4b [装备合成]=======装备详情显示修改 2022-06-14 17:32:32 +08:00
wangzhenxing c68de7d7a8 [装备合成]======装备合成按钮居中 2022-06-14 16:09:07 +08:00
wangzhenxing 5d41ecc114 【装备】======添加蓝白装备 2022-06-14 15:58:18 +08:00
wangzhenxing 56380704c7 【装备】====装备添加青金品质 2022-06-13 16:38:48 +08:00
wangzhenxing c382f44681 [英雄技能]======飞升技能显示修改 2022-06-13 16:35:30 +08:00
wangzhenxing 9d0ae084f6 Merge branch 'china/dev' into china/test 2022-06-10 17:11:14 +08:00
wangzhenxing 9102ea064c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-06-10 14:43:19 +08:00
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 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
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 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
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
yuanshuai d39933b48d 红点提交 2022-05-18 20:06:18 +08:00
wangzhenxing d4a6bfdda2 【神将排版优化】========神将信息界面修改 2022-05-18 20:00:57 +08:00
yuanshuai 9c9018b1da 终身卡功能提交 2022-05-18 19:39:19 +08:00
wangzhenxing 4a4ea1c784 【排行榜】=======关卡排行改山河设计图星星排行报错修改 2022-05-18 14:52:58 +08:00
wangzhenxing 8eec6cb793 【关卡排行】=====关卡界面关卡排行榜修改 2022-05-18 13:48:03 +08:00
yuanshuai c9dfe177e6 百抽派送活动提交 2022-05-17 13:23:15 +08:00
wangzhenxing ac6e551a1f 【车迟斗法】=====入口提示修改 2022-05-17 10:35:54 +08:00
wangzhenxing b31dae947c 【抽卡】========抽卡提示 2022-05-16 18:20:17 +08:00
wangzhenxing 46499a8401 【车迟斗法】=======屏蔽车迟斗法开服七天后才能进入 2022-05-16 16:09:21 +08:00
wangzhenxing 09f2f05214 【战斗】=====如果之前是3倍速,就转成二倍速 2022-05-16 13:40:53 +08:00
wangzhenxing e337559c30 【战斗】=======屏蔽战斗三倍数,2倍速改为2.5倍速 2022-05-16 13:23:16 +08:00
wangzhenxing a7d570255b 【跳过】================战斗跳过功能提示修改 2022-05-16 13:03:54 +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
zhangshanxue 810fd2cacb Merge branch 'china/dev' into china/test 2022-03-29 17:04:16 +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
wangzhenxing 24475514b9 【bug】======命石属性描述修改 2022-03-29 13:39:05 +08:00
wangzhenxing 3e9ed638b4 [bug]=====命石描述修改,车迟开启提示修改 2022-03-29 11:54:41 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
wangzhenxing 91ace072a2 [功能]=====车迟斗法开服7日后开启 2022-03-28 15:29:10 +08:00
zhangshanxue a6fa8cdc4b Merge branch 'china/dev' into china/test 2022-03-28 11:06:34 +08:00
wangzhenxing c593cdf2d6 [bug]======寻宝特效穿透修改 2022-03-25 14:12:19 +08:00
jiaoyangna ef74528bc7 对充值活动进行关闭 2022-03-23 16:23:31 +08:00
jiaoyangna c66ce27a88 主城特效修改提交 2022-03-22 15:43:16 +08:00
wangzhenxing eceb6abcdc [探索]=========屏蔽功能入口 2022-03-22 14:01:59 +08:00
jiaoyangna 40630efdb4 山河试炼倒计时修改提交 2022-03-22 13:45:34 +08:00
jiaoyangna 54faa0a971 山河试炼活动报错修改 2022-03-22 13:38:59 +08:00
jiaoyangna 2c9e94dcc9 牛气冲天任务修改提交 2022-03-22 11:57:50 +08:00
jiaoyangna 5348a49256 Revert "冲突提交"
This reverts commit b5a29c9152.
2022-03-22 11:06:54 +08:00
jiaoyangna 1ab08284a4 牛气冲天任务状态修改提交 2022-03-22 11:06:03 +08:00
jiaoyangna c93b9e3f04 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-21 18:29:21 +08:00
jiaoyangna b5a29c9152 冲突提交 2022-03-21 18:29:03 +08:00
wangzhenxing e936ce29ce [战斗]======选择英雄添加新判断 2022-03-21 18:23:54 +08:00
wangzhenxing 4562629709 [功能]==============修行技能添加战斗力提交 2022-03-21 17:46:30 +08:00
jiaoyangna b57a82309b 山河试炼修改提交 2022-03-21 17:21:11 +08:00
jiaoyangna 31afc70951 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-21 11:04:38 +08:00
jiaoyangna 096845f8ad 【ID1011356】
山河试炼添加引导
2022-03-21 11:04:08 +08:00
wangzhenxing 3529402f5e [战斗]=========被动431修改 2022-03-21 10:22:12 +08:00
wangzhenxing 3e5b67ddf6 【技能】=========149 150 修改提交 2022-03-18 16:29:03 +08:00
wangzhenxing 9e010245fe [战斗]========技能149 被动429 430 431修改提交 2022-03-18 15:47:16 +08:00
jiaoyangna 18803bfc29 东海寻仙提交 2022-03-18 13:25:09 +08:00
wangzhenxing 01b3a8c35b 【战斗】=======护盾效果表现修改 2022-03-17 16:50:40 +08:00
wangzhenxing 0f2eebfe42 [战斗]===================被动433修改 技能添加148 2022-03-17 16:15:34 +08:00
jiaoyangna 31b1721510 探索提交 2022-03-17 15:21:08 +08:00
wangzhenxing a82de03880 [战斗]=======被动431 -434修改提交 2022-03-17 10:12:35 +08:00
gaoxin 61ce0ea1bc 【四灵试炼】修复选择四灵中佩戴唯一性的魂印的助战神将,会导致自己无法佩戴的问题 2022-03-15 18:23:52 +08:00
gaoxin 81f76cc4dc 【限时折扣】主界面按钮资源修改添加特效 2022-03-15 13:37:13 +08:00
wangzhenxing 008b3671c4 [战斗]======buff提示文字修改 2022-03-14 17:10:15 +08:00
wangzhenxing eff4c32f68 [战斗]========被动431修改 2022-03-14 14:06:12 +08:00
gaoxin e97ab8fa84 【跳转】锻器阁页签顺序修改导致判断错误 2022-03-11 17:34:15 +08:00
gaoxin 52bdc56af4 【锻器阁】调整魂印和宝物的顺序 2022-03-11 16:57:04 +08:00
gaoxin d48d420dd2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-11 16:36:58 +08:00
gaoxin de178b9875 【锻器阁】未解锁的功能显示未解锁提示 2022-03-11 16:36:47 +08:00
wangzhenxing 8e05053512 【战斗】=========被动429 430 431添加提交 2022-03-11 16:30:38 +08:00
jiaoyangna 81ca63fc7e 车迟积分修改提交 2022-03-10 18:20:35 +08:00
jiaoyangna 1e39c04f7d 车迟结算界面积分修改提交 2022-03-10 18:17:44 +08:00
jiaoyangna 18e5994279 车迟斗法提交 2022-03-10 18:08:45 +08:00
jiaoyangna 5be4e726ea 挂机收益显示错误修改 2022-03-10 17:04:37 +08:00
jiaoyangna 9de941b911 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-10 13:45:32 +08:00
jiaoyangna e5dde41cda 【ID1011337】
【优化】车迟斗法抢夺目标 ,玩家积分显示
【ID1011218】
天书秘卷功能图标位置调整
2022-03-10 13:45:12 +08:00
张彪 2ea7d31c8b 【张彪】交接文档 2022-03-09 17:01:10 +08:00
张彪 b120f5ccd5 【主城】修改右侧条状态 2022-03-08 14:05:24 +08:00
jiaoyangna 0b42597919 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-07 17:28:00 +08:00
jiaoyangna 0c8af1e9b5 天地洪炉修改提交 2022-03-07 17:27:42 +08:00
张彪 3ffdee3acb 【战力冲刺】提交 2022-03-07 16:10:46 +08:00
张彪 22514fe5f7 【战力冲刺】调整 2022-03-07 16:05:38 +08:00
张彪 98443bbdb2 Revert "【战力冲刺】领取功能调整"
This reverts commit 5a5bc3237b.
2022-03-07 14:30:31 +08:00
张彪 5f7cb1b4df Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-07 13:18:21 +08:00
张彪 5a5bc3237b 【战力冲刺】领取功能调整 2022-03-07 13:18:14 +08:00
jiaoyangna bc01045eae 山河试炼奖励显示错误修改 2022-03-07 10:21:56 +08:00
jiaoyangna d6a67e89f2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-07 10:13:08 +08:00
jiaoyangna a2fd8dcaea 山河试炼奖励显示错误修改提交 2022-03-07 10:12:51 +08:00
gaoxin 1d3ef22dac 【玩家信息】兼容以前 2022-03-04 18:26:36 +08:00
gaoxin 51b829874d 【角色信息】所有跨服查看信息的不再可以添加好友和黑名单,修复跨服信息显示错误 2022-03-04 18:13:16 +08:00
gaoxin b10ebcd3ba 【车迟斗法】抢夺界面添加跨服显示 2022-03-04 17:48:27 +08:00