Commit Graph

4084 Commits (994d2602845afe8d9202a1f7a758f0a3ed454527)

Author SHA1 Message Date
wangzhenxing 4e04803971 多对塔修改 2023-11-14 18:34:01 +08:00
xiejun dd28cdb75f 道具栏UI修改 2023-11-14 18:27:30 +08:00
xiejun 5a845a29a2 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-11-14 17:13:17 +08:00
xiejun 07e72f4829 修改ExpeditionMonsterInfoPopup预制体 2023-11-14 17:12:24 +08:00
wangzhenxing edd2d39035 小弹窗修改 2023-11-14 17:12:15 +08:00
wangzhenxing 22ec1e1baa 伤害记录界面修改提交 2023-11-14 13:50:52 +08:00
xiejun 0e67a3d189 关卡详情界面预制体修改 2023-11-13 19:06:34 +08:00
PC-202302260912\Administrator d3b82be19c 法宝聚灵修改 2023-11-13 18:57:41 +08:00
wangzhenxing 0939d80af9 角色信息界面修改 2023-11-13 18:46:25 +08:00
xiejun 667c386356 修行预制体 2023-11-13 18:09:09 +08:00
xiejun 7d4c58f026 修行界面 2023-11-13 18:05:45 +08:00
wangzhenxing b0fddd3f5e 剧情界面修改 2023-11-13 16:02:32 +08:00
wangzhenxing 1ca943c83e 神将热榜界面修改 2023-11-13 15:45:17 +08:00
wangzhenxing bc2603a3f2 备战界面设置界面修改 2023-11-13 15:34:29 +08:00
wangzhenxing 0fa9e66802 战斗界面修改 2023-11-13 15:21:57 +08:00
wangzhenxing 18afe46e8c 多对塔队伍信息界面修改 2023-11-13 14:28:33 +08:00
xiejun f49e326c83 战斗的胜败,首领信息,最佳mvp等界面 2023-11-12 16:24:40 +08:00
wangzhenxing 45afafba01 排行榜备战界面修改 2023-11-11 18:05:39 +08:00
xiejun d876a69a23 十绝阵BUG修复 2023-11-11 17:27:09 +08:00
wangzhenxing 879687f705 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-11-11 17:16:27 +08:00
wangzhenxing 8a2c188c55 编队界面修改 2023-11-11 17:14:29 +08:00
xiejun 6c95c05b6c 和之国寻宝预制体修改 2023-11-11 17:11:23 +08:00
wangzhenxing cec18f4890 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-11-11 16:55:20 +08:00
wangzhenxing f969aebf50 备战界面修改 2023-11-11 16:55:08 +08:00
xiejun 445bdaac11 金币经验副本的选中框和标题字体调整 2023-11-11 16:51:05 +08:00
wangzhenxing 4f8df5ec36 英雄列表,图鉴修改 2023-11-11 16:43:23 +08:00
wangzhenxing a86bd59ffb 阵容属性加成界面 2023-11-11 16:31:30 +08:00
xiejun 7bd1f0772a 调整字体 2023-11-11 16:20:04 +08:00
xiejun 164e8afd3b 调整修行界面的按钮(PracticePanel) 2023-11-11 16:15:28 +08:00
wangzhenxing f580db9af8 图鉴修改提交 2023-11-11 16:13:52 +08:00
wangzhenxing 9ee7c9793f 灵兽界面修改 2023-11-11 15:42:30 +08:00
xiejun c52bf49652 调整红点位置 2023-11-11 15:13:11 +08:00
xiejun d6c57eb391 战令预制体修改 2023-11-11 15:03:03 +08:00
wangzhenxing 3aabe8d438 四元阵支援预设修改提交 2023-11-11 11:30:06 +08:00
PC-202302260912\Administrator 2cc9806cbf 修改页面 2023-11-10 18:55:25 +08:00
xiejun c65eccc68f 永久折扣(giftpre)的预制体修改 2023-11-10 18:07:49 +08:00
PC-202302260912\Administrator 0f19f85ac1 修改通用页面 2023-11-10 17:53:41 +08:00
PC-202302260912\Administrator 98a35bb5d8 商店购买页面 2023-11-10 17:52:28 +08:00
xiejun 7cdff99432 商店UI修改 2023-11-10 17:47:26 +08:00
wangzhenxing 763485a157 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-11-10 17:37:57 +08:00
wangzhenxing a8b4a5c3de gm通用提示界面修改 2023-11-10 17:37:53 +08:00
PC-202302260912\Administrator 3aae22dfb3 结算页面修改 2023-11-10 17:25:50 +08:00
wangzhenxing 4a684042f4 挂机界面修改,战斗流程修改 2023-11-10 17:24:48 +08:00
PC-202302260912\Administrator 871e7eecba 修改通用页面 2023-11-10 17:05:21 +08:00
wangzhenxing 430b10a5d0 排行榜,背包界面修改提交 2023-11-10 16:13:26 +08:00
xiejun 6e1a65aa13 修改副本怪物显示弹窗预制体 2023-11-10 15:49:20 +08:00
wangzhenxing d38fdf9717 首充预设修改提交 2023-11-10 15:35:12 +08:00
wangzhenxing 52f3600ef6 挂机奖励显示修改 2023-11-10 15:07:17 +08:00
wangzhenxing 94bdb33e38 挂机界面修改 2023-11-10 14:42:52 +08:00
wangzhenxing abcc306af1 命石预设修改提交 2023-11-10 14:07:03 +08:00
wangzhenxing 62d0af98c2 挂机界面提交 2023-11-10 11:48:41 +08:00
xiejun d988829154 战斗场景根据配置加载 2023-11-09 18:22:16 +08:00
PC-202302260912\Administrator 7b869484dc 魂印修改 2023-11-09 17:34:52 +08:00
wangzhenxing 477f3356d8 战斗添加空判断,结算界面修改 2023-11-09 17:29:29 +08:00
wangzhenxing 437d083f68 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-11-09 16:01:13 +08:00
wangzhenxing a7f2d39189 刷冲界面修改提交 2023-11-09 16:00:42 +08:00
xiejun e09a6a9c23 战斗背景替换和战斗逻辑的修改 2023-11-09 16:00:30 +08:00
wangzhenxing 31718ea87d 主界面修改升级界面修改 2023-11-09 15:35:38 +08:00
wangzhenxing 3df62f9ebf 解散界面修改 2023-11-09 11:34:01 +08:00
PC-202302260912\Administrator 3c5fde5a4d 周卡相关东西 2023-11-09 11:09:19 +08:00
wangzhenxing b00f874236 点石成金修改提交 2023-11-09 10:52:24 +08:00
PC-202302260912\Administrator ff7b956505 loading相关 2023-11-08 19:10:09 +08:00
PC-202302260912\Administrator e05f116a8e 首冲 2023-11-08 18:36:25 +08:00
xiejun 1e3ef6f5a3 副本名称和战斗位置 2023-11-08 18:18:47 +08:00
wangzhenxing 890e6b157d 充值豪礼按钮图标修改 2023-11-08 17:38:45 +08:00
wangzhenxing d9722c0f9f 活动界面显示修改 2023-11-08 16:57:26 +08:00
PC-202302260912\Administrator 26d8bab9e3 日常奖励 2023-11-08 16:17:47 +08:00
wangzhenxing 8223d041f9 聊天界面修改 2023-11-08 15:52:49 +08:00
PC-202302260912\Administrator e9cd0629fc 修改通用页面 2023-11-08 15:03:11 +08:00
wangzhenxing 8da4412a87 主城预设 修改提交 2023-11-08 13:55:38 +08:00
PC-202302260912\Administrator 5f14e298b7 踏碎凌霄 2023-11-08 11:27:11 +08:00
PC-202302260912\Administrator d437ad593f 变身卡升星页面修改 2023-11-07 20:23:52 +08:00
wangzhenxing 6c2a9c4a84 主城界面修改 2023-11-07 18:14:22 +08:00
wangzhenxing 10b4329744 Revert "聊天系统初步调整"
This reverts commit a4db288249.
2023-11-07 17:11:57 +08:00
wangzhenxing 37ee1910ca 商店,主界面修改 2023-11-07 16:58:37 +08:00
PC-202302260912\Administrator a4db288249 聊天系统初步调整 2023-11-07 16:39:55 +08:00
wangzhenxing f335977a4b 装备详情界面修改 2023-11-07 15:56:30 +08:00
PC-202302260912\Administrator 98fe20b8da 服务器选择页面 2023-11-06 19:46:18 +08:00
PC-202302260912\Administrator ede8dfb379 新功能提示修改 2023-11-06 18:59:23 +08:00
xiejun 4c382362a7 十绝阵UI 2023-11-06 17:26:18 +08:00
wangzhenxing f25e213b73 命石界面修改 2023-11-06 16:58:35 +08:00
PC-202302260912\Administrator 9689657905 神将抽卡展示列表修改 2023-11-06 16:01:47 +08:00
PC-202302260912\Administrator 5c018c4781 修改奖池预览表头 2023-11-06 15:51:31 +08:00
PC-202302260912\Administrator 92697e036c 通用页面上传 2023-11-06 15:21:57 +08:00
wangzhenxing dfb08cf018 探索统计界面修改 2023-11-06 11:20:04 +08:00
PC-202302260912\Administrator 63c62d80f5 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-11-03 19:26:16 +08:00
PC-202302260912\Administrator 7bb9276a39 优化抽卡页面 2023-11-03 19:19:38 +08:00
xiejun e1f533f0aa 奖励预览UI 2023-11-03 19:19:21 +08:00
wangzhenxing 0ec0ccc6b2 玩家界面修改提交 2023-11-03 18:43:17 +08:00
PC-202302260912\Administrator 42c6da7293 优化境界预览 2023-11-03 18:18:14 +08:00
PC-202302260912\Administrator 8d00feb410 微调 2023-11-03 18:10:46 +08:00
xiejun 531b7b9d9d 单次抽奖的预制体 2023-11-03 18:02:49 +08:00
PC-202302260912\Administrator 449914982d 优化日常任务 2023-11-03 17:58:56 +08:00
PC-202302260912\Administrator fb1855b590 修改境界预览 2023-11-03 17:57:54 +08:00
PC-202302260912\Administrator f067eaaff6 七日狂欢微调 2023-11-03 16:50:23 +08:00
xiejun 7318de05d2 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-11-03 16:46:07 +08:00
xiejun 9b27835185 抽卡 2023-11-03 16:45:33 +08:00
PC-202302260912\Administrator bd14ba8b41 优化首充页面 2023-11-03 16:38:45 +08:00
wangzhenxing 0d2638355a 主界面修改 2023-11-03 15:46:07 +08:00
PC-202302260912\Administrator 8015168fbc 心愿奖励 2023-11-03 15:39:29 +08:00
wangzhenxing 2f160b4e67 挂机界面修改 2023-11-03 14:21:13 +08:00
wangzhenxing 90134677d2 急速探索界面修改提交 2023-11-03 11:42:57 +08:00
PC-202302260912\Administrator e3e24353ef 神将 2023-11-02 19:22:51 +08:00
wangzhenxing 86d0aadc5d 超值连冲界面修改提交 2023-11-02 18:49:37 +08:00
wangzhenxing d972e70e05 推荐阵容修改提交 2023-11-02 18:10:22 +08:00
wangzhenxing 0167d707bf 首充修改提交 2023-11-02 17:46:09 +08:00
xiejun a45b0fbb23 点将台UI 2023-11-02 17:24:35 +08:00
PC-202302260912\Administrator 192e92416e 在线奖励相关 2023-11-02 16:58:30 +08:00
wangzhenxing c67eb7f7ad 神兵系统界面修改提交 2023-11-02 16:03:11 +08:00
PC-202302260912\Administrator 7c0cf86935 首充相关 2023-11-01 19:08:54 +08:00
wangzhenxing 9a86ec8026 神兵主界面修改提交 2023-11-01 19:02:00 +08:00
PC-202302260912\Administrator a87bca727c 限时折扣 2023-11-01 17:29:04 +08:00
xiejun f9bf9b27be 修改预制体 2023-11-01 17:19:09 +08:00
PC-202302260912\Administrator fc66533d1a 阵营推荐 2023-11-01 16:27:05 +08:00
wangzhenxing 730966a6df Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-11-01 15:47:46 +08:00
wangzhenxing dbac53d14d 属性信息界面,技能信息界面修改 2023-11-01 15:47:17 +08:00
xiejun f939ff8ac8 神将置换UI 2023-11-01 15:46:54 +08:00
PC-202302260912\Administrator 121a97c801 添加按钮 2023-11-01 15:24:32 +08:00
wangzhenxing 08fea279e1 化身卡修改提交 2023-11-01 15:11:41 +08:00
PC-202302260912\Administrator d4779c6a3d 超级特权相关 2023-11-01 14:39:15 +08:00
PC-202302260912\Administrator a4e942f285 修改限时兑换 2023-10-31 19:42:01 +08:00
PC-202302260912\Administrator 442e99da6d 限时兑换 2023-10-31 18:55:40 +08:00
wangzhenxing 7d0f4225b7 七日狂欢界面修改 2023-10-31 18:36:31 +08:00
wangzhenxing 6f771c23cb 月卡 开服狂欢界面修改 2023-10-31 17:25:27 +08:00
PC-202302260912\Administrator fd4f2f833e 七日登录 2023-10-31 17:14:03 +08:00
PC-202302260912\Administrator 90eab3e98d 7日登陆 2023-10-31 17:00:08 +08:00
wangzhenxing ad48afbfe9 礼物界面修改提交 2023-10-31 16:23:50 +08:00
xiejun 1e53fbc529 锻器阁 2023-10-31 15:30:06 +08:00
wangzhenxing 9d6308c909 法宝聚灵界面修改提交 2023-10-31 14:38:02 +08:00
PC-202302260912\Administrator b15c4f942e 礼物相关 2023-10-31 11:43:32 +08:00
wangzhenxing 55aa1ed967 英雄spine预设位置修改 2023-10-31 10:51:14 +08:00
PC-202302260912\Administrator c11ad012de 四象心法优化 2023-10-30 20:28:39 +08:00
wangzhenxing d1a9cff2c5 法宝聚灵修改提交 2023-10-30 19:16:17 +08:00
wangzhenxing d5334e08e4 四项心法界面修改 2023-10-30 17:11:52 +08:00
PC-202302260912\Administrator ae6fe98e10 四象心法 2023-10-30 16:34:27 +08:00
PC-202302260912\Administrator 7088098c1a 四象心法修改 2023-10-30 16:29:58 +08:00
wangzhenxing ed63b42413 法宝聚灵修改提交 2023-10-30 15:27:42 +08:00
PC-202302260912\Administrator f4012ea61e 红点位置修改 2023-11-06 17:17:32 +08:00
PC-202302260912\Administrator 24183b728a 等级背景框修正 2023-10-28 16:26:55 +08:00
PC-202302260912\Administrator 21d8e1ee5b 添加日常任务缺少的图片 2023-10-28 16:08:31 +08:00
PC-202302260912\Administrator b245afd6a6 修正天宫 2023-10-28 15:55:08 +08:00
wangzhenxing 0406690f56 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-10-28 15:41:33 +08:00
wangzhenxing 44f6ea0e86 抽取命石添加次数限制 2023-10-28 15:41:17 +08:00
PC-202302260912\Administrator aeb72a1f7b 天宫寻宝 2023-10-28 15:41:04 +08:00
xiejun 1c56d6629d 修改公会,和恭喜获得的UI 2023-10-27 17:39:09 +08:00
wangzhenxing c625b8d011 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-10-27 17:09:21 +08:00
wangzhenxing dd9444c745 屏蔽英雄觉醒显示 2023-10-27 17:09:16 +08:00
xiejun 8ef7efa6c1 达人活动UI和神印BUG 2023-10-27 16:41:28 +08:00
wangzhenxing 1c65cd4052 法灵修改 2023-10-27 16:16:37 +08:00
wangzhenxing e795b4834b 法灵红点提交 2023-10-27 14:10:43 +08:00
PC-202302260912\Administrator 7965174646 公告 2023-10-27 13:27:39 +08:00
PC-202302260912\Administrator ba397d1aaf 添加 2023-10-27 11:11:38 +08:00
wangzhenxing 9a1646ec48 法宝升级显示修改 2023-10-26 20:54:06 +08:00
wangzhenxing ed4865cc3c 法宝星级显示修改 2023-10-26 20:44:18 +08:00
xiejun f55839e351 预制体修改 2023-10-26 18:52:51 +08:00
xiejun 805179cc81 升星冲榜补充 2023-10-26 18:50:39 +08:00
xiejun fafab89f48 升星冲榜UI 2023-10-26 18:44:37 +08:00
wangzhenxing 3b64b3db82 法宝强化界面修改 2023-10-26 18:33:53 +08:00
wangzhenxing 0d08ea1a84 法灵提交 2023-10-26 17:16:10 +08:00
xiejun d9d842c5be 恭喜获得 2023-10-26 14:54:18 +08:00
xiejun 965fc5d494 十绝症UI 2023-10-25 18:51:09 +08:00
wangzhenxing a41aacf703 法灵强化界面预设提交 2023-10-25 18:39:36 +08:00
PC-202302260912\Administrator c70d1b7700 无限送抽 2023-10-25 16:56:39 +08:00
PC-202302260912\Administrator 84581526be 预制体修改 2023-10-25 16:12:49 +08:00
PC-202302260912\Administrator fe702e50c4 天宫寻宝 2023-10-25 16:06:27 +08:00
xiejun 663fbca133 神兵热榜 2023-10-24 20:02:38 +08:00
wangzhenxing 50a42471ec 删除无用预设脚本 2023-10-24 18:20:31 +08:00
xiejun a82fdafe48 回滚底部按钮 2023-10-24 13:36:37 +08:00
xiejun 100980e98b 删除老预制体 2023-10-23 17:51:23 +08:00
xiejun e1d0445714 修改bug,删除部分老预设 2023-10-23 17:44:09 +08:00
xiejun 443dbba568 充值UI修改 2023-10-20 18:51:12 +08:00
PC-202302260912\Administrator 98168f92a1 成就相关 2023-10-20 17:18:23 +08:00
PC-202302260912\Administrator 8006a761aa 信息界面调整 2023-10-20 15:22:34 +08:00
PC-202302260912\Administrator 99d70ca52d 月卡换底 2023-10-20 13:24:17 +08:00
PC-202302260912\Administrator 788392feca 超值连充半成品 2023-10-20 11:34:23 +08:00
xiejun d7762a4a00 登录界面替换UI 2023-10-19 22:51:00 +08:00
PC-202302260912\Administrator 34ba7a787d 月卡相关 2023-10-19 22:43:48 +08:00
xiejun 2212a7443d 邮件和邮件内容UI 2023-10-19 21:05:35 +08:00
xiejun bfbce921a3 屏蔽修行按钮,更换日常任务的UI,修改了好友的按钮选择显示逻辑 2023-10-19 17:42:21 +08:00
xiejun 432fc640f3 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-10-18 20:45:10 +08:00
xiejun 077b82bd84 好友,公会副本等UI修改 2023-10-18 20:41:04 +08:00
wangzhenxing b7949c7e91 法灵信息界面提交 2023-10-18 17:28:34 +08:00
wangzhenxing 152e0bcde0 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-10-16 17:11:50 +08:00
wangzhenxing c43520367a 潜能红点提交 2023-10-16 17:11:07 +08:00
xiejun bb83290058 排行榜UI 2023-10-16 16:16:02 +08:00
wangzhenxing a66437ec72 潜能提交 2023-10-16 15:12:47 +08:00
xiejun f9adc3d4a7 排行榜和修复BUG 2023-10-13 11:24:19 +08:00
xiejun ff21cd74d2 竞技场部分预制体修改 2023-10-10 18:53:44 +08:00
wangzhenxing fff8911f19 英雄信息界面预设修改 2023-10-10 10:29:23 +08:00
xiejun 44087689d4 灵兽 2023-10-08 16:53:34 +08:00
xiejun eb926fc087 灵兽 2023-09-28 17:05:40 +08:00
wangzhenxing de562386e0 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
2023-09-28 16:01:34 +08:00
wangzhenxing 1e1fd36489 玩家信息界面修改 2023-09-28 16:00:26 +08:00
wangzhenxing db71c4df20 神将主界面修改 2023-09-21 18:58:21 +08:00
wangzhenxing bb18772265 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2023-09-21 18:43:54 +08:00
xiejun d53329f6fb 灵兽部分UI 2023-09-21 18:36:44 +08:00
wangzhenxing b0650bbb20 主角礼物显示修改 2023-09-21 16:41:59 +08:00
xiejun c47462c5d8 Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-09-20 18:57:44 +08:00
xiejun 88740201b3 排行榜UI 2023-09-20 18:00:40 +08:00
wangzhenxing ff5bcbced9 礼物合成显示秀嘎,添加礼物商店跳转 2023-09-20 17:40:33 +08:00
wangzhenxing 266c5b12af 礼物修改 点将神符不足弹出提示 2023-09-20 14:37:05 +08:00
wangzhenxing 600f270128 礼物添加总属性显示,逍遥游寻仙修改 2023-09-19 18:03:00 +08:00
wangzhenxing 1556e5c6a9 礼物合成提交 2023-09-18 17:41:06 +08:00
xiejun af6b341a0c 修改子弹逻辑 2023-09-18 15:41:32 +08:00
wangzhenxing c037d9a2a2 玩家信息预设修改
(cherry picked from commit a6c2a99bbb)
2023-09-15 15:38:55 +08:00
wangzhenxing a6c2a99bbb 玩家信息预设修改 2023-09-15 14:58:13 +08:00
wangzhenxing e3a8cd725f 合并冲突提交 2023-09-15 14:24:03 +08:00
wangzhenxing acdb5a21cd 礼物修改提交 2023-09-15 14:11:14 +08:00
wangzhenxing 049cebd574 灵兽星际显示修改提交 2023-09-15 13:56:38 +08:00
PC-202302260912\Administrator dca95dff13 修改页面布局 2023-09-13 16:38:07 +08:00
wangzhenxing e80056fcd4 查看礼物信息提交 2023-09-13 15:44:06 +08:00
wangzhenxing eeb3859f72 礼物功能提交 2023-09-13 14:57:48 +08:00
xiejun 363b5a3818 图鉴UI 2023-09-04 18:27:40 +08:00
xiejun 87bd10593d 工会 2023-09-02 18:59:49 +08:00
xiejun 3ab79a59b7 副本UI 2023-09-02 18:53:21 +08:00
xiejun c6d6e21e57 修改 2023-09-02 18:04:06 +08:00
xiejun 0a3533dbfe 挑战副本 2023-09-02 17:17:15 +08:00
xiejun 5b8ef487f7 御灵 2023-09-02 17:16:34 +08:00
xiejun 1a34fec66e 修复bug 2023-09-01 20:18:46 +08:00
wangzhenxing c9418f9821 命石奖励预设修改 2023-09-01 19:01:33 +08:00
xiejun 83a8e9ab56 修改 2023-09-01 18:27:39 +08:00
wangzhenxing 55f0c6d3e6 魂印图鉴修改 ,命石修改 2023-09-01 18:04:52 +08:00
wangzhenxing 2b93776f7c 命格修改提交 2023-09-01 17:36:15 +08:00
wangzhenxing 18e10b4fb6 命格修改提交 2023-08-31 19:12:02 +08:00
wangzhenxing 5e1cc83b2a 命石修改提交 2023-08-31 15:20:27 +08:00
wangzhenxing 52393c592c 命石提交 2023-08-31 15:02:13 +08:00
xiejun 837e769c14 七界 2023-08-30 22:07:43 +08:00
xiejun 87c1193f8b 修改BUG 2023-08-30 21:25:36 +08:00
xiejun f1b9b526c1 代码修改 2023-08-30 20:33:29 +08:00
xiejun 96efe07502 prefab布鲁克 2023-08-29 19:18:35 +08:00
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
xiejun 4d8b08104c 七界资源 2023-08-28 18:52:15 +08:00
xiejun f549956ebb 新预制体已经公会和活动ui 2023-08-28 11:34:43 +08:00
wangzhenxing 3037378c42 神将热榜, 图鉴预设修改提交 2023-08-23 16:04:46 +08:00
xiejun 65d783dae1 修改BUG 2023-08-18 17:55:02 +08:00
xiejun 21d0262140 修改预制体 2023-08-16 16:42:05 +08:00
wangzhenxing a2ed294523 英雄信息界面变身卡星级显示修改 2023-08-16 11:36:58 +08:00
xiejun 32d5e9bb97 修改BUG 2023-08-15 20:52:29 +08:00
xiejun 06733b98e2 配置 2023-08-15 17:36:26 +08:00
xiejun 01087658fc 公会UI 2023-08-15 16:26:36 +08:00
xiejun bbde945918 新角色立绘 2023-08-15 12:36:04 +08:00
xiejun 19231ba20a 公会UI 2023-08-14 16:36:26 +08:00
wangzhenxing 3e08e50ea5 周卡预设修改提交 2023-08-11 19:25:16 +08:00
xiejun 148443883c 神将 2023-08-11 19:03:48 +08:00
wangzhenxing bd11611e2d 易经宝库层级显示修改提交 最终大奖名字显示修改 2023-08-10 13:47:37 +08:00
xiejun 43d80275b9 神将部分UI替换 2023-08-04 18:58:14 +08:00
wangzhenxing 9b7627ffe0 商店界面预设修改提交 2023-07-31 18:12:46 +08:00
xiejun fd8329bf90 海贼UI 2023-07-27 18:37:04 +08:00
wangzhenxing 5ac2ed1220 山河设计图添加关卡提示 2023-07-24 11:31:36 +08:00
xiejun 8a4e15e258 海贼UI替换 2023-07-21 17:04:16 +08:00
PC-202302260912\Administrator a1294d8746 天宫寻宝文字修改 2023-07-20 15:42:56 +08:00
PC-202302260912\Administrator da7727ba02 item预设特效显示修改 2023-07-18 16:09:16 +08:00
xiejun ed0681d015 路飞,萨博 2023-07-17 18:47:07 +08:00
PC-202302260912\Administrator 2082425679 抽卡界面预设修改,添加未开启信息提示 2023-07-17 17:38:43 +08:00
PC-202302260912\Administrator 65b4f5fc20 周卡活动名称修改 2023-07-17 14:48:27 +08:00
xiejun 937ec44bf5 立绘和代码修改 2023-07-13 14:38:34 +08:00
xiejun ab2e8eb833 增加技能特效spine 2023-07-06 14:08:10 +08:00
xiejun 214151b5ca 修改 2023-07-04 10:28:57 +08:00
xiejun ab6a726b3a 增加凯多角色 2023-07-02 21:52:32 +08:00
xiejun fd59086676 主界面UI替换 2023-06-30 00:13:43 +08:00
xiejun 0bb8dfbb6e 凱多的live2d 2023-06-29 15:04:58 +08:00
PC-202302260912\Administrator 02a2374c53 主城=======洞府,跨服战入口屏蔽,灵兽山位置修改 2023-07-12 18:23:39 +08:00
PC-202302260912\Administrator cf6de3c6e5 身外化身属性预览界面修改 2023-07-07 17:48:19 +08:00
PC-202302260912\Administrator 32ac61db17 罗浮争锋移到竞技场,屏蔽竞技场巅峰赛 2023-07-07 13:51:34 +08:00
PC-202302260912\Administrator 236cb983d9 itemview预设修改 2023-07-06 16:26:25 +08:00
PC-202302260912\Administrator cecf89dc70 装备招募显示修改 2023-07-06 15:48:40 +08:00
xiejun b47c16dcb7 test 2023-06-20 18:01:51 +08:00
PC-202302260912\Administrator 6c6a7d19f7 山河社稷图提交开放章节提示 2023-06-14 18:12:47 +08:00
wangzhenxing 8f3e691ba6 充值界面屏蔽下面仙晶提示 2023-06-12 15:04:25 +08:00
wangzhenxing d1c46a2b4e 心愿奖励预览提交 2023-06-07 11:36:53 +08:00
wangzhenxing 14e16c3d34 心愿法宝弹窗修改 2023-06-06 16:50:56 +08:00
wangzhenxing ebfddaad60 法宝心愿修改提交 2023-06-06 15:57:53 +08:00
lihaiyang 5738e0f178 修正月卡页面 2023-06-02 16:56:16 +08:00
lihaiyang f0ce97f220 修正月卡和特种特权的图 2023-06-02 13:54:03 +08:00
lihaiyang fd47661916 修正字体大小 2023-06-01 10:59:49 +08:00
wangzhenxing df07616ab3 变身卡修改提交 2023-05-31 17:21:13 +08:00
wangzhenxing ac172339ae 心愿抽卡修改提交 2023-05-27 19:04:30 +08:00
yuanshuai d4a971e087 Merge branch 'china/dev_bt_develop' into china/dev_bt
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/HomeLandEquipPopup.lua
2023-05-08 17:42:35 +08:00
yuanshuai db1e9a9305 时空职业bug修改 2023-05-08 11:21:53 +08:00
wangzhenxing 254c85f3de 化虚潭预设修改 2023-04-21 16:26:06 +08:00
wangzhenxing 12675fb170 神将置换添加新职业 2023-04-21 14:18:03 +08:00
wangzhenxing 1f94c3d234 变身卡添加职业 2023-04-21 13:24:26 +08:00
wangzhenxing 7758ec6d8d 法宝自选箱,宝物添加时空选项 2023-04-21 10:50:09 +08:00
wangzhenxing d074625942 英雄列表预设修改提交 2023-04-14 13:52:47 +08:00
wangzhenxing 06b9371e79 多队塔秘宝修改提交 2023-04-12 15:33:19 +08:00
wangzhenxing 6d3fe931d3 [神兵]==============修改提交 2023-04-12 11:31:04 +08:00
wangzhenxing 0e2fc0aad2 战斗测试界面修改提交 2023-04-07 16:56:54 +08:00
yuanshuai ac104c73ca 预设修改 2023-04-07 14:32:34 +08:00
yuanshuai fc218b4002 神兵回炉代码提交 2023-04-07 10:29:10 +08:00
yuanshuai a7ccff7ff1 神兵功能优化 2023-04-06 18:13:54 +08:00
yuanshuai c8184bbca4 神兵功能优化 2023-04-06 15:28:55 +08:00
wangzhenxing cbd60b5e14 [战斗]==================战斗添加神兵 2023-04-06 14:02:32 +08:00
yuanshuai 6f5528173c 添加技能图标 2023-04-04 15:38:45 +08:00
yuanshuai 22ebe21c0a 预设提交 2023-04-04 14:59:06 +08:00
yuanshuai 047274e736 Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop 2023-04-04 14:55:05 +08:00
yuanshuai be268b9662 神兵升星强化优化 2023-04-04 14:54:14 +08:00
lihaiyang f6ed14e951 神兵修为布局 2023-04-04 14:49:53 +08:00
yuanshuai a176bca619 神兵相关修改提交 2023-03-31 17:52:12 +08:00
yuanshuai bda6306f3d 神兵升级升星相关功能提交 2023-03-30 16:27:13 +08:00
yuanshuai 782c351cec Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua
2023-03-30 13:27:35 +08:00