Commit Graph

3913 Commits (55aa1ed9670416b4250c38f663045117f65b7741)

Author SHA1 Message Date
wangzhenxing 4b4ed9f63a [bt]=======名望特权修改 2022-11-22 15:30:03 +08:00
wangzhenxing e1455a6dbd [bt]======聊天修改 2022-11-22 14:23:35 +08:00
wangzhenxing d914ebd111 魂宝灵宝增加精炼技能,神印增加套装技能 2022-11-18 17:35:05 +08:00
lihaiyang 44fcc55ce4 【刷冲特权】===========字体修改 2022-11-03 16:59:11 +08:00
yuanshuai 4b10be80c9 主城神尊名望特权添加特效 2022-11-17 14:21:56 +08:00
yuanshuai 38d96a2191 神尊界面调整 2022-11-17 11:30:16 +08:00
yuanshuai 41d594edbc 挑战副本修改优化 2022-11-17 10:48:24 +08:00
shihongyi 141c732e4d 月卡去掉左下收益图 2022-11-18 23:46:44 +08:00
lihaiyang 155f83671d 【无限资源阁】===修正字体描述 2022-11-16 11:34:18 +08:00
yuanshuai a04fb2ac2f Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-11-15 16:35:55 +08:00
yuanshuai 617d292b47 英雄一键升级 2022-11-15 16:35:48 +08:00
lihaiyang 98f68504bc 【挑战副本】======修正描述 2022-11-15 14:03:56 +08:00
wangzhenxing f1e9105b96 寻仙招募移到点将台修改 2022-11-14 17:43:00 +08:00
yuanshuai 5fc4f301c4 挑战副本修改 2022-11-14 11:19:18 +08:00
wangzhenxing 186b9c16db 新手引导界面透明度降低 2022-11-14 11:12:23 +08:00
wangzhenxing 9a26b3559f 森罗幻境奖励界面优化 2022-11-11 15:04:40 +08:00
wangzhenxing f0eb2a75ab 好感度修改提交 2022-11-10 15:37:34 +08:00
yuanshuai 298478e182 ... 2022-11-10 14:01:14 +08:00
wangzhenxing 3b88556b82 gm按钮修改 2022-11-10 11:09:10 +08:00
wangzhenxing 5113dfb137 元神抽卡添加10连 2022-11-10 10:22:17 +08:00
wangzhenxing b39188841a 每日累充修改 魂印描述修改 2022-11-09 17:55:54 +08:00
shihongyi 3df404296c 四元阵 10连 2022-11-12 03:51:53 +08:00
wangzhenxing eeca517eaf 屏蔽普通特权入口 2022-11-09 10:24:03 +08:00
wangzhenxing 0ed8fcf2f4 [心魔]======红点优化 2022-11-08 15:58:18 +08:00
wangzhenxing 119c186c34 [主城]=======按钮修改提交 2022-11-08 14:51:51 +08:00
wangzhenxing 223fb60204 神魂特效显示修改,冲榜活动奖励修改 2022-11-07 17:24:41 +08:00
wangzhenxing 1a2a407d66 太初特权添加提示 2022-11-07 15:00:36 +08:00
lihaiyang dbfe9e32ee 【开服狂欢】=========布局修正 2022-11-08 18:17:08 +08:00
lihaiyang 1b958a87d8 【神尊特权】======添加tips 2022-11-03 07:03:35 +08:00
wangzhenxing b73735f7cb 刷冲特权优化,通关某关卡添加空判断 2022-11-04 15:40:41 +08:00
lihaiyang 4058cc96f5 【点金】===页面布局调整 2022-11-02 14:06:47 +08:00
lihaiyang 1e7c2fae98 【刷充特权】===========刷冲特权页面调整 2022-11-03 11:34:46 +08:00
lihaiyang 024b3d5c07 【开服狂欢】==========修正购买按钮长度 2022-11-03 10:06:18 +08:00
lihaiyang 85e9632df7 【刷冲特权】============布局修改 2022-11-02 19:06:25 +08:00
wangzhenxing de4deae3ad 刷冲预设修改提交 2022-11-03 16:05:29 +08:00
yuanshuai b32a8c4625 神尊特权优化 2022-11-03 15:27:00 +08:00
wangzhenxing 19ce8e51d5 英雄升星扩展 2022-11-03 14:33:09 +08:00
lihaiyang d5ba8bdfe9 【天宫寻宝】==========修改title 2022-11-02 13:33:21 +08:00
yuanshuai 3ff54b15a3 Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-11-03 10:57:55 +08:00
yuanshuai 45ad268ee8 神尊特权 幸运转盘 GM刷冲礼包功能优化 2022-11-03 10:57:45 +08:00
wangzhenxing 9163954640 背包添加变身卡描述 2022-11-02 18:14:24 +08:00
wangzhenxing fa54c65598 变身卡加成预览提交 2022-11-02 17:20:28 +08:00
wangzhenxing c8357f1daa 开服冲榜预设修改 2022-11-02 13:35:00 +08:00
wangzhenxing d2af9edc0f [gm]======变身卡修改提交 2022-11-02 11:48:41 +08:00
lihaiyang 840e322366 【热榜】==========界面优化 2022-11-02 10:46:05 +08:00
wangzhenxing 1e62991c2c [gm]=====开服冲榜提交 2022-10-31 18:13:41 +08:00
wangzhenxing b27dc2f3c3 [gm]========gm转盘修改 2022-10-28 15:45:53 +08:00
wangzhenxing 7e20349490 [gm]=====转盘预设修改 2022-10-28 10:58:52 +08:00
wangzhenxing ac078416dd [gm]======转盘提交 2022-10-27 15:32:13 +08:00
lihaiyang 6400a78108 【刷冲GM】UI大小调整 2022-10-26 18:25:11 +08:00
wangzhenxing ffe26f1210 【bt】====任务奖励预览修改 2022-10-26 11:22:35 +08:00
wangzhenxing 5fbc31d8e8 [gm]======免费充值界面修改 2022-10-25 13:51:43 +08:00
lihaiyang 7b65301173 【名望】====特权布局修改 2022-10-24 15:39:19 +08:00
lihaiyang 39dd11c6e8 【名望】====修正标题 2022-10-24 11:26:40 +08:00
lihaiyang 8806336bea 【名望】=====名望界面修改 2022-10-24 11:06:38 +08:00
wangzhenxing a0e830b025 [bt]======变身卡碎片显示修改 2022-10-21 10:25:10 +08:00
wangzhenxing 8d63d391a6 [gm]==============声望特权提交 2022-10-20 17:48:00 +08:00
wangzhenxing 480ae21f30 [gm]=====主程界面添加名望入口 2022-10-19 15:34:41 +08:00
lihaiyang 6d0f9e4e37 【无限充抽】======按钮位置修正 描述修正 2022-10-18 14:52:27 +08:00
lihaiyang 684c4477b7 【无限充抽】========修正奖励位置 修正描述 2022-10-18 14:39:57 +08:00
lihaiyang 329c203318 【GM刷冲特权】=========修正图标位置添加框 2022-10-18 14:26:38 +08:00
wangzhenxing 85d26f1b0c Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-10-17 16:15:06 +08:00
wangzhenxing 74d375cf7f [送无限抽]=======提交 2022-10-17 16:13:47 +08:00
lihaiyang 6fd794f3b1 【刷冲特权】=======背景透明度调整 2022-10-17 15:29:37 +08:00
lihaiyang a754caa9e4 【GM刷冲特权】========位置调整 2022-10-17 15:18:21 +08:00
wangzhenxing 436955609b 仙充直冲礼包提交 2022-10-13 14:54:03 +08:00
wangzhenxing a264f9dddd [首充]=======修改提交 2022-10-13 11:28:55 +08:00
wangzhenxing 1f9835e44f 道具详情预设修改 2022-09-23 16:07:05 +08:00
wangzhenxing efe732d91d [gm]=============刷冲特权提交 2022-09-23 15:24:10 +08:00
wangzhenxing a8f46604c9 [gm]======创角即送提交 2022-09-21 16:08:59 +08:00
wangzhenxing fdaec2ac28 [gm修改器]=====提交 2022-09-20 17:04:48 +08:00
wangzhenxing e4b2b44199 [全民福利]======优化 2022-09-16 17:29:23 +08:00
yuanshuai bf27ddd677 神尊特权预设修改 2022-09-15 18:11:56 +08:00
wangzhenxing 5a1440cd69 [全民福利]=====提交 2022-09-15 16:48:56 +08:00
lihaiyang f50028cef7 [无限资源阁]========界面修改提交 2022-09-01 18:22:04 +08:00
wangzhenxing ff824e3f3a [全民福利]=====预设修改提交 2022-09-14 13:33:22 +08:00
yuanshuai 7447eab324 神尊特权预设修改 2022-09-13 16:50:56 +08:00
yuanshuai 23416c35cf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-09-09 18:09:59 +08:00
yuanshuai d42106b07e 神尊特权提交 2022-09-09 18:09:45 +08:00
wangzhenxing b6b1f53d64 [bt]=====无限资源阁提交 2022-09-09 16:45:58 +08:00
yuanshuai e3f58fbbec 物品神应等级显示 2022-09-07 15:25:36 +08:00
yuanshuai b9ec95da65 预设修改 2022-09-06 16:10:15 +08:00
yuanshuai e91edae1cf 建木神树bug修改 2022-09-06 15:47:16 +08:00
yuanshuai 573ea577ce 建木神树修改提交 2022-09-06 10:16:57 +08:00
yuanshuai a506dc7997 界面显示修改提交 2022-09-02 14:26:03 +08:00
yuanshuai 08cf1d1ea8 添加重置 2022-09-02 13:15:24 +08:00
yuanshuai cfa84cff79 预设修改 2022-09-01 17:32:03 +08:00
yuanshuai 96f8605bb1 摘星阁脚本预设提交 2022-09-01 17:30:15 +08:00
wangzhenxing 44787f9e58 [背包]======背包提交法宝页签 2022-08-30 18:10:07 +08:00
yuanshuai a10a386b24 法宝修改提交 2022-08-30 15:55:37 +08:00
wangzhenxing 7ec1580c3e [变身卡]======开启添加等级限制 2022-08-18 17:02:35 +08:00
wangzhenxing bf31576d31 [森罗幻境]====一键扫荡按钮限时隐藏 2022-08-18 11:27:36 +08:00
wangzhenxing 0a0b37c6db Merge branch 'china/dev' into china/dev_slhj 2022-08-18 10:32:19 +08:00
wangzhenxing bb9f877652 [显示招募]====添加珍奇宝阁 2022-08-17 17:45:12 +08:00
wangzhenxing 9c144af11c [森罗幻境]=====添加扫荡 2022-08-17 14:23:45 +08:00
wangzhenxing 57727ef104 [逍遥游]====时间预设修改提交 2022-08-15 14:35:12 +08:00
wangzhenxing 2f84d554cc 【法宝】=====法宝自选箱加提示 2022-08-11 14:15:11 +08:00
wangzhenxing c08410abc6 商店添加法宝提示 2022-08-10 16:28:54 +08:00
wangzhenxing bd1ad039d9 [洞府摘星阁]======摘星阁消耗修改 2022-08-08 16:13:14 +08:00
wangzhenxing bf108a4f18 [周卡]======周卡修改提交 2022-07-26 17:39:41 +08:00
wangzhenxing b0dfb411b8 [数字游戏]======红点修改提交 2022-07-25 15:06:04 +08:00
wangzhenxing 4ca74759ba [图鉴,英雄详情]======添加神魂按钮 2022-07-22 13:43:25 +08:00
yuanshuai cd0d9bad9e 添加八日登陆红点 2022-07-21 13:43:03 +08:00
yuanshuai adf5df15dc 云梦豪礼修改 2022-07-20 13:39:03 +08:00
yuanshuai b072429de6 云梦豪礼修改提交 2022-07-20 13:32:37 +08:00
wangzhenxing ff2d384861 Merge branch 'china/test' into china/dev 2022-07-19 17:50:54 +08:00
wangzhenxing 6e360fa353 【首充】======界面逻辑显示修改 2022-07-18 11:03:54 +08:00
wangzhenxing 83cb55b464 [疯体iOS]====添加sdk使用按钮 2022-07-15 16:02:35 +08:00
wangzhenxing 6c1fef8db0 [英雄详情]=====预设技能名称位置修改 2022-07-15 11:51:38 +08:00
yuanshuai 113e0ceb73 数字游戏缺失资源提交 2022-07-13 18:37:23 +08:00
wangzhenxing acf9c48281 [挂机界面]======图标大小调整 2022-07-12 18:39:43 +08:00
wangzhenxing 5535d7df71 [首充]=====首充修改 2022-07-12 18:25:50 +08:00
yuanshuai 5137eb1b8f 数字游戏日语提示修改 2022-07-12 15:27:34 +08:00
wangzhenxing 66664bd3e2 [心愿抽卡]=======预设修改提交 2022-07-12 14:26:32 +08:00
yuanshuai d952b9a44c 数字游戏模块提交 2022-07-11 15:43:04 +08:00
yuanshuai 6683285c95 商城箭头添加 2022-07-06 13:21:40 +08:00
yuanshuai 7f65810d70 宝箱添加点击详情 2022-07-06 11:40:35 +08:00
yuanshuai 5bda9d59a4 缥缈之旅修改 2022-07-04 16:38:07 +08:00
wangzhenxing 43e1913e37 [首充]=====首充按钮普通关卡大小调整 2022-06-30 18:27:53 +08:00
wangzhenxing d2df97df2a [首充]=======首充添加到普通关卡界面 2022-06-30 18:17:58 +08:00
wangzhenxing 6aecf37abe [人物信息]====命石信息修改 2022-06-20 15:00:43 +08:00
wangzhenxing 44714b91af [易经宝库]=====预设修改 2022-06-20 14:52:49 +08:00
wangzhenxing d796a106bc [超值连冲]========活动修改红点修改 2022-06-17 16:00:48 +08:00
wangzhenxing a85a96a4ac [周卡]=====预设修改 2022-06-17 11:44:40 +08:00
luyao d194a2d0c1 更改价格文字颜色,去除outline。去除价格文字衬底图片 2022-06-15 15:34:36 +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
yuanshuai b74a00e7df 界面调整 2022-06-10 16:37:56 +08:00
wangzhenxing 396ca1a425 [洞府]=======洞府特权修改 2022-06-10 14:42:35 +08:00
yuanshuai a74690a384 周卡月卡界面调整 2022-06-09 17:10:07 +08:00
yuanshuai 2d18090df7 周卡月卡脚本预设提交 2022-06-09 14:19:07 +08:00
wangzhenxing 7c34cec6f3 [抽卡]=====宝箱名字修改 2022-06-09 13:57:12 +08:00
wangzhenxing 259f8636b5 [主城]=======屏蔽主城探索入口 2022-06-08 14:00:18 +08:00
wangzhenxing 51eb81d46c [周卡]======周卡修改提交 2022-06-08 10:08:31 +08:00
wangzhenxing 0086c01ff6 [首充]======首充修改提交 2022-06-07 15:48:54 +08:00
wangzhenxing 49c3a298cf 【获取英雄】======预设修改提交 2022-06-07 11:06:32 +08:00
wangzhenxing 9eb6f8fb4e [英雄信息]=====背景修改 2022-06-06 16:14:29 +08:00
wangzhenxing 6bc4adee78 [英雄信息界面]=====背景修改 2022-06-06 15:43:15 +08:00
wangzhenxing 86eb8ab054 [英雄信息界面]======文字颜色修改 2022-06-06 10:55:28 +08:00
wangzhenxing 504da04293 [英雄信息界面]=======底图修改 2022-06-06 10:52:55 +08:00
wangzhenxing 90abea11a0 [周卡]=====预设修改 2022-06-01 16:25:23 +08:00
wangzhenxing f685d37c4d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-06-01 14:50:54 +08:00
wangzhenxing dd7a256469 [周卡]======红点修改提交 2022-06-01 14:50:08 +08:00
yuanshuai 7a00d4afb4 终身卡预设修改 2022-06-01 13:49:10 +08:00
wangzhenxing 054c31caee [周卡]=====红点提交 2022-06-01 13:23:34 +08:00
wangzhenxing 5578a77085 [周卡]====预设提交 2022-06-01 09:37:44 +08:00
wangzhenxing 19203e65aa [好友聊天]======界面修改 2022-05-28 15:11:42 +08:00
wangzhenxing 4c259df154 [公会boss]=====刷新次数修改 2022-05-24 15:12:44 +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 e7df09c284 [寻仙招募]======修改提交 2022-05-23 11:29:10 +08:00
wangzhenxing 2b75be487d 天赋按钮位置图片修改 2022-05-19 22:37:52 +08:00
wangzhenxing 5e27a00173 英雄技能详情修改 2022-05-19 21:33:38 +08:00
wangzhenxing 6c902c649b [首充]=====求掉显示10星属性按钮 2022-05-19 21:13:08 +08:00
wangzhenxing a368bfa790 英雄主界面位置调整 2022-05-19 21:00:00 +08:00
wangzhenxing d97c84a543 [英雄详情修改i] 2022-05-19 20:43:41 +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 d4a6bfdda2 【神将排版优化】========神将信息界面修改 2022-05-18 20:00:57 +08:00
yuanshuai 9c9018b1da 终身卡功能提交 2022-05-18 19:39:19 +08:00
wangzhenxing 4ef723e229 [神印]====显示修改 2022-05-05 11:52:48 +08:00
luyao 25ee0998e7 一键探索 按钮背景更换 2022-04-28 20:05:23 +08:00
luyao f353cc18eb 祭品神将选择。【一键选择】、【选定】按钮背景更换 2022-04-28 19:57:15 +08:00
luyao af5f307a49 鸿蒙阵 解锁玄黄之气 确认按钮背景修改 2022-04-28 19:52:25 +08:00
luyao e810e85e5e 洞府界面。升级按钮 背景修改 2022-04-28 19:35:57 +08:00
luyao 8b67cc01f9 玉虚论道。按钮背景修改 2022-04-28 19:30:12 +08:00
luyao 9db3e7edd9 更改七界试炼 挑战按钮背景 2022-04-28 19:05:32 +08:00
luyao e852fea1cb 锻器阁 三个页签【合成】按钮背景更换 2022-04-28 18:58:54 +08:00
luyao 845e1d33e5 修改 千战逐胜台 右侧按钮大小尺寸 2022-04-28 18:42:52 +08:00
luyao 716556d9a2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-28 18:03:43 +08:00
luyao 5188ade977 修改 千战逐胜台 的【挑战】按钮背景图片,更换了【今日免费挑战次数】的文字描述及位置 2022-04-28 18:03:25 +08:00
yuanshuai 9700f316fe 主城洞府位置修改 2022-04-28 17:17:49 +08:00
luyao 672402b37f 修改山河社稷图中【每日领取/购买】玉衡龙须丹弹窗的领取按钮背景 2022-04-28 16:58:43 +08:00
luyao 42613ffc52 修改山河社稷图三星关卡 及 特殊关卡 【挑战】按钮背景图 2022-04-28 16:47:30 +08:00
yuanshuai 2d95eddb30 主城跨服战竞技场按钮位置调整 2022-04-28 15:20:29 +08:00
yuanshuai 0805e5054d 身外化身界面调整 2022-04-28 11:58:48 +08:00
wangzhenxing 78bf3d5a7e 物品详情界面动画修改 2022-04-28 10:16:08 +08:00
yuanshuai d1111be7eb 化身卡升级升星红点提交 2022-04-27 18:08:55 +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 4199ea504a 查看其他玩家信息,变身卡信息不对bug 2022-04-26 17:20:19 +08:00
wangzhenxing 81122369c6 bug修改提交 2022-04-26 16:09:21 +08:00
wangzhenxing 84f96972ce 预设修改提交 2022-04-26 11:51:51 +08:00
yuanshuai 565d4007df 化身之力界面调整 2022-04-25 18:42:19 +08:00
yuanshuai e4e244d36b 化身界面修改 2022-04-25 18:03:37 +08:00
yuanshuai 7c543952e5 身外化身界面修改 2022-04-25 15:52:46 +08:00
yuanshuai 4e5ccff820 身外化身界面调整 2022-04-25 14:42:17 +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
yuanshuai 9ec3724c5d 身外化身界面调整 2022-04-24 20:27:05 +08:00
yuanshuai 882f77e164 界面修改 2022-04-24 19:46:59 +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
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 ebf73ca029 神印预设提交 2022-04-22 18:01:00 +08:00
luyao 3adb7d0558 聊天界面优化(更换背景图,对话文字颜色更改、聊天底框更改 ) 2022-04-22 16:33:44 +08:00
luyao f620d95f5e 【tips背板】修改提交 2022-04-22 15:49:52 +08:00
wangzhenxing df42d22d4c 公用背景预设修改提交 2022-04-22 14:07:30 +08:00
wangzhenxing e4de85a120 tips背景修改,公用弹窗背景显示修改 2022-04-22 13:09:45 +08:00
luyao 8d3062083f 聊天功能,更换背景图 2022-04-22 10:05:57 +08:00
luyao 4f28a4d4c3 tips界面更换背板 文字配色 2022-04-21 18:03:38 +08:00
wangzhenxing 9999138d97 [资源]=======新提示背景框提交 2022-04-21 13:41:59 +08:00
yuanshuai dc8704a806 探索商店跳转入口添加 2022-04-28 10:48:08 +08:00
yuanshuai bf52645eb7 挑战副本优化 2022-04-25 18:20:53 +08:00
yuanshuai b4a626d9e2 挑战副本脚本修改提交 2022-04-18 18:48:06 +08:00
yuanshuai 9ebdab46b3 挑战副本相关脚本提交 2022-04-14 16:07:45 +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 4bb0977391 [bug]=======bug修改预设提交 2022-04-02 14:33:08 +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
jiaoyangna 4252fde78f 【ID1011380】
装备和宝石属性修正

(cherry picked from commit 2f54afd172d5da2223cd5e5f8a5cc26b430985ae)
2022-03-30 13:40:37 +08:00
jiaoyangna 857a23aea8 【ID1011391】
飞升鸿蒙阵等级限制调整

(cherry picked from commit 7dc728ef802a75a0d5d0c67907429f43c01befde)
2022-03-29 16:26:06 +08:00
wangzhenxing 9f2b6a80b5 [功能]=======命石显示修改 2022-03-29 15:49:54 +08:00
wangzhenxing 57812ad22f [功能]=======命石修改,建木神树修改 2022-03-29 15:28:56 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
wangzhenxing c593cdf2d6 [bug]======寻宝特效穿透修改 2022-03-25 14:12:19 +08:00
jiaoyangna b57a82309b 山河试炼修改提交 2022-03-21 17:21:11 +08:00
jiaoyangna 096845f8ad 【ID1011356】
山河试炼添加引导
2022-03-21 11:04:08 +08:00
jiaoyangna 18803bfc29 东海寻仙提交 2022-03-18 13:25:09 +08:00
jiaoyangna 31b1721510 探索提交 2022-03-17 15:21:08 +08:00
wangzhenxing 008b3671c4 [战斗]======buff提示文字修改 2022-03-14 17:10:15 +08:00
wangzhenxing d6fc62cfd5 【修行】======修行界面技能显示修改 2022-03-14 14:07:51 +08:00
jiaoyangna 43dc67acba 鸿蒙阵文字修改提交 2022-03-10 17:40:21 +08:00
jiaoyangna fd0ee200ac 【ID1011218】
天书秘卷功能图标位置调整
2022-03-10 16:15:07 +08:00
jiaoyangna 58c7fd9946 【ID1011218】
天书秘卷功能图标位置调整
2022-03-10 13:48:28 +08:00
jiaoyangna e5dde41cda 【ID1011337】
【优化】车迟斗法抢夺目标 ,玩家积分显示
【ID1011218】
天书秘卷功能图标位置调整
2022-03-10 13:45:12 +08:00
张彪 5a416c5149 【车迟斗法】工会界面倒计时 2022-03-03 13:30:25 +08:00
张彪 5d4e85832d 【易经宝库】提交 2022-03-03 09:53:22 +08:00
gaoxin 8558152b29 【立绘】东华帝君,孟婆立绘回归 2022-03-02 19:00:38 +08:00
jiaoyangna a01a70e9bb 红点提交 2022-03-02 18:09:49 +08:00
jiaoyangna 3b0871ad17 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-02 18:08:56 +08:00
jiaoyangna 6b4cf31c3c 【ID1011205】
山河试炼调整到第一周开启,限时14天,投定向将
2022-03-02 17:48:52 +08:00
张彪 0048bf4e79 【易经宝库】显示特效 2022-03-02 16:37:22 +08:00
张彪 d33dcb9f97 【装备】装备添加快捷入口到摘星阁 2022-03-02 14:15:13 +08:00
张彪 9a60ee25f1 【战力冲刺】底部页签剧中 2022-02-25 15:52:18 +08:00
张彪 2bb1f6a944 【战力冲刺】提交 2022-02-25 13:14:37 +08:00
张彪 6f5aad16b3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-24 18:19:50 +08:00
张彪 1ae90cb549 【战力冲刺】修改提交 2022-02-24 18:19:39 +08:00
jiaoyangna d0720e17b2 【ID1011178】
至尊降世活动拉到1000档
2022-02-23 17:24:34 +08:00
jiaoyangna 1905b3c175 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-21 18:37:18 +08:00
jiaoyangna 3ccf3c29a3 ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
2022-02-21 18:36:21 +08:00
张彪 9345c31d8b 【战力冲刺】提交 2022-02-21 10:40:27 +08:00
张彪 b51c7b7780 【战力冲刺】提交 2022-02-18 17:02:27 +08:00
张彪 4ca27d13ad 【战力冲刺】提交 2022-02-18 16:27:49 +08:00
张彪 fe6547358c 【灵兽宝阁】珍奇宝阁提交 2022-02-18 15:19:37 +08:00
张彪 f9fca9ca93 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-17 17:14:46 +08:00
张彪 14af727eab 【战力冲刺】提交 2022-02-17 16:27:36 +08:00
jiaoyangna a76616df31 【ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
2022-02-17 15:13:26 +08:00
wangzhenxing d03215cc16 [资源]========神菩提提交
(cherry picked from commit fb9ad83e40f24e680cbc395ba82f777db7422e7e)
2022-02-17 10:40:12 +08:00
gaoxin bfbc3b7195 【拍脸】寻仙招募界面显示错误修改 2022-02-24 16:49:19 +08:00
gaoxin 545e06c474 Merge branch '0功能/寻仙招募拍脸' into china/dev 2022-02-24 15:57:18 +08:00
gaoxin 2342bd8af8 【拍脸】寻仙招募拍脸添加 2022-02-23 18:08:50 +08:00
gaoxin 5cf3527762 【资源】特惠商城资源替换 2022-02-23 18:37:50 +08:00
jiaoyangna e27c51ee93 超值返利提交 2022-02-11 15:57:58 +08:00
jiaoyangna f8d55e0138 预设漏提 2022-02-11 15:09:47 +08:00
jiaoyangna 072edac018 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-11 11:26:51 +08:00
jiaoyangna 7e62f47ca8 【ID1011130】
【活动优化】超值返利
2022-02-11 11:26:34 +08:00
张彪 9ba115e464 【每日特惠修改】 2022-02-11 10:35:42 +08:00
张彪 b868d5ff2f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-10 17:53:20 +08:00
张彪 4659ad0f84 【活动优化】每日特惠优化 2022-02-10 17:53:00 +08:00
jiaoyangna bd5d09def0 【ID1011132】
【活动优化】每日豪礼
2022-02-10 16:49:21 +08:00
wangzhenxing e21fec89ac [图鉴]===============图鉴角色信息面板预设修改 2022-02-08 17:30:52 +08:00
wangzhenxing 9e73d667a2 [战斗]========加御甲显示修改 2022-01-24 16:20:07 +08:00
jiaoyangna 5eca555299 浮生门按钮层级修改提交 2022-01-24 16:07:21 +08:00
jiaoyangna 0fea3d1fd4 节日修改提交 2022-01-22 14:37:01 +08:00
jiaoyangna e3a44ff121 适配修改提交 2022-01-22 13:50:21 +08:00
jiaoyangna a44233c365 节日提交 2022-01-22 13:34:19 +08:00
jiaoyangna ec7be4c020 节日提交 2022-01-22 13:27:25 +08:00
jiaoyangna 5cea36a143 节日修改提交 2022-01-22 11:37:59 +08:00
jiaoyangna 227e0f68c1 特效提交 2022-01-22 11:12:47 +08:00
jiaoyangna 3a9acbdf19 签到好礼提交 2022-01-21 18:49:40 +08:00
jiaoyangna 1f4c38a710 显示修改 2022-01-21 14:27:07 +08:00
gaoxin 4c00b471ad 【战斗】添加头像显示 2022-01-21 11:59:19 +08:00
wangzhenxing 7de5fdac9e [飞升]=====特效问题修改 2022-01-20 17:58:57 +08:00
gaoxin 69a1e5bca6 【公会成员信息界面修改】 2022-01-20 17:50:35 +08:00
wangzhenxing 46f337312e [飞升]========特效修改 2022-01-20 15:06:04 +08:00
ZhangBiao 6ff00013f5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-20 11:55:01 +08:00
ZhangBiao 7d5c79b514 【排行榜】卡动画修改 2022-01-20 11:52:26 +08:00
wangzhenxing e734c4a03d [飞升]=======飞升修改 2022-01-20 11:41:20 +08:00
ZhangBiao 908cee1961 【神将信息】图鉴信息便宜修改 2022-01-19 18:30:09 +08:00
wangzhenxing 109648ae93 Merge branch 'china/dev' into china/飞升 2022-01-19 16:13:20 +08:00
wangzhenxing 4034a90a33 [飞升]======优化修改提交 2022-01-19 15:29:47 +08:00
jiaoyangna 76295739f3 【ID1019513】
【品质调整】神将技能弹窗,不关闭也可以点返回
2022-01-18 15:01:01 +08:00
jiaoyangna b5cc0635ae Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-18 14:49:50 +08:00
jiaoyangna ac24c2e0ce 【ID1010998】
【春节活动】签到领奖活动
2022-01-18 14:48:27 +08:00
ZhangBiao 54aeaa2ea8 【寻仙招募】提交 2022-01-18 12:09:43 +08:00
wangzhenxing ff5866e00e [法宝详情]=======添加返回按钮 2022-01-18 11:57:38 +08:00
wangzhenxing 4298209c33 [战斗]=======护盾buff修改 2022-01-18 11:44:36 +08:00
wangzhenxing 7f9868ca59 [bug]=====奖池预览修改,图鉴详情添加点击反馈 2022-01-18 10:45:39 +08:00
wangzhenxing a6e05ae8e8 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-18 09:53:04 +08:00
wangzhenxing 2e0bd1ded7 [飞升]=======显示修改 2022-01-18 09:47:38 +08:00
wangzhenxing 1de7293630 [飞升]======卡牌飞升预设修改 2022-01-17 16:53:26 +08:00
gaoxin b7055edd5e 【图鉴】神将信息屏幕适配修改 2022-01-17 16:08:52 +08:00
wangzhenxing d5fd95373f [抽卡奖池]======抽卡奖池预览修改 2022-01-17 15:56:27 +08:00
wangzhenxing f257bc2c6d [图鉴]=====图鉴神魂按钮显示修改 2022-01-17 14:26:17 +08:00
ZhangBiao e3196e3ca2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-17 13:16:30 +08:00
ZhangBiao 409836ffb5 【名望礼包】提交 2022-01-17 13:16:18 +08:00
wangzhenxing 6be87dec74 Merge branch 'china/dev' into china/飞升 2022-01-17 11:00:42 +08:00
wangzhenxing 51d1f9e5a7 【图鉴】======图鉴列表界面预设修改 2022-01-17 10:58:36 +08:00
wangzhenxing a7ad2ee1f6 Merge branch 'china/dev' into china/飞升 2022-01-17 10:50:14 +08:00
wangzhenxing 082afa8466 【飞升】=====角色主界面修改 2022-01-17 10:47:15 +08:00
wangzhenxing 21e77fe60b [图鉴]=======图鉴详情预设修改 2022-01-17 10:45:42 +08:00
ZhangBiao e93b2816b4 【摘星阁】装备摘星阁属性拆分 2022-01-17 10:24:27 +08:00
wangzhenxing 9357e70d42 [角色信息]======名字位置修改 2022-01-15 18:44:08 +08:00
wangzhenxing 0b3007a9c7 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-15 18:16:56 +08:00
ZhangBiao e67ea3ae70 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-15 17:34:26 +08:00
ZhangBiao b96aa3851c 【好感度】提交 2022-01-15 17:34:18 +08:00
wangzhenxing 1d170dfd2d [图鉴]==========图鉴详情修改提交 2022-01-15 17:12:40 +08:00
ZhangBiao 3ad8b6b6c3 【玩家信息】提交 2022-01-15 15:44:08 +08:00
ZhangBiao c373f8d014 【修改】提交 2022-01-15 15:05:26 +08:00
ZhangBiao f4c1b9d097 【修改】提交 2022-01-15 14:34:55 +08:00
ZhangBiao fa1c832170 【坐骑】增加详细信息 2022-01-15 13:00:45 +08:00
wangzhenxing ef0a0ff436 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2022-01-15 12:47:22 +08:00
wangzhenxing 853fde91b2 [飞升]============飞升修改提交 2022-01-15 12:26:12 +08:00
ZhangBiao 232491eb95 Merge branch 'china/dev' into 0优化/玩家信息界面拓展 2022-01-15 09:14:10 +08:00
jiaoyangna 9f5addf443 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 19:14:04 +08:00
jiaoyangna 98f23e56ea 神将修改提交 2022-01-14 19:13:46 +08:00
wangzhenxing c2c9eda981 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 18:50:17 +08:00
wangzhenxing 05377b9595 [图鉴]==== 图鉴 图鉴详情界面修改 2022-01-14 18:49:49 +08:00
jiaoyangna b0611db595 神将技能修改提交 2022-01-14 18:48:23 +08:00
jiaoyangna ea69ec6643 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 17:59:05 +08:00
jiaoyangna 81ce84e7be 升级修改提交 2022-01-14 17:57:12 +08:00
ZhangBiao cbea9006b3 【家园】资源替换 2022-01-14 17:38:46 +08:00
ZhangBiao dddbe9f223 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 17:20:18 +08:00
ZhangBiao 9ec22eee1f 【好感度】引导 2022-01-14 17:20:06 +08:00
jiaoyangna c11db3056f 神将修改 2022-01-14 17:13:36 +08:00
jiaoyangna 0189f5c742 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 16:15:17 +08:00
jiaoyangna 3f267894a8 神将修改提交 2022-01-14 16:14:52 +08:00
ZhangBiao 8f554eca59 Merge branch 'china/dev' into 0优化/玩家信息界面拓展 2022-01-14 16:02:59 +08:00
gaoxin 1c827a3a23 【关卡】有可挑战关卡时添加小手显示 2022-01-14 16:02:10 +08:00
ZhangBiao 28d3f421bc 【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息提交 2022-01-14 15:44:45 +08:00
jiaoyangna 053de388f2 神将修改提交 2022-01-14 14:52:56 +08:00
ZhangBiao 771c445488 Merge branch 'china/dev' into 0优化/玩家信息界面拓展 2022-01-14 14:16:47 +08:00
jiaoyangna 7556405e8b 切图修改 2022-01-14 13:45:12 +08:00
jiaoyangna 5252dbe400 技能添加底图 2022-01-14 13:20:32 +08:00
jiaoyangna 981aba2417 神将情报修改提交 2022-01-14 11:26:13 +08:00
jiaoyangna 8377e33b31 神将情报修改提交 2022-01-14 10:50:51 +08:00
jiaoyangna e4ea506ed1 神将情报修改提交 2022-01-14 10:17:19 +08:00
ZhangBiao 5b36346da3 【玩家信息】提交 2022-01-13 18:29:12 +08:00
gaoxin 70d753cce5 极速探索按钮颜色调整 2022-01-13 16:41:12 +08:00