Commit Graph

10064 Commits (d9829f0314acbf89cc7c9e355a38e186fbe880c3)

Author SHA1 Message Date
PC-202302260912\Administrator 0a2c562b7a 助战登录不计算战力修改 2024-04-23 16:11:56 +08:00
PC-202302260912\Administrator 19f762b19a 变身卡战斗修改 2024-04-23 15:43:24 +08:00
PC-202302260912\Administrator 04208d42fd 小兵挂机修改 2024-04-23 15:15:37 +08:00
PC-202302260912\Administrator 325e4af975 挂机修改提交 2024-04-23 14:33:31 +08:00
PC-202302260912\Administrator 85a1c55958 四灵屏蔽助战功能 2024-04-23 11:32:07 +08:00
PC-202302260912\Administrator 8a4b380966 小兵显示打印 2024-04-23 10:21:31 +08:00
PC-202302260912\Administrator d8e3b56557 删除资源 2024-04-22 19:04:32 +08:00
PC-202302260912\Administrator 58edbefb0c 罗浮奖励提交 2024-04-22 18:41:59 +08:00
DESKTOP-MMO982B\User f23967e39b 神兽列表“已出战”文本颜色修改 2024-06-23 19:13:35 +08:00
PC-202302260912\Administrator cee117927f Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider 2024-04-22 17:50:01 +08:00
PC-202302260912\Administrator 031c5bf667 罗浮提交 2024-04-22 17:49:14 +08:00
PC-202302260912\Administrator 5423b926e7 Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab
2024-04-22 13:54:41 +08:00
DESKTOP-MMO982B\User 75a376efcd 引导对话框修改 2024-04-21 01:45:01 +08:00
PC-202302260912\Administrator f76765a926 罗浮修改提交 2024-04-20 14:02:42 +08:00
PC-202302260912\Administrator 5c237203c4 英雄技能修改 2024-04-22 11:17:51 +08:00
PC-202302260912\Administrator 86403011b7 抽卡修改 2024-04-20 20:05:27 +08:00
PC-202302260912\Administrator 738fdd468f 屏蔽神将置换功能 2024-04-20 19:29:46 +08:00
PC-202302260912\Administrator d9e1951a83 首充引导修改 2024-04-20 18:47:27 +08:00
PC-202302260912\Administrator 7f4cfb598f 升级弹窗修改 2024-04-20 17:34:21 +08:00
PC-202302260912\Administrator 11b694c28b 升级提示界面弹出修改 2024-04-20 16:32:12 +08:00
PC-202302260912\Administrator bfe692b377 优化页面 2024-04-20 15:41:54 +08:00
PC-202302260912\Administrator a84e223cb4 修改页面显示 2024-04-21 16:58:55 +08:00
PC-202302260912\Administrator f888b22aee 优化页面 2024-04-21 16:28:18 +08:00
PC-202302260912\Administrator 114b158823 挑战场景 2024-04-21 15:31:21 +08:00
PC-202302260912\Administrator f04a2c175f 修改 2024-04-19 11:23:19 +08:00
PC-202302260912\Administrator c2b76ff19f 优化页面 2024-04-21 20:11:32 +08:00
PC-202302260912\Administrator 52bca04bfe 修改字体颜色和描述 2024-04-05 16:39:18 +08:00
PC-202302260912\Administrator 26025d9302 修改技能描述字 2024-04-05 16:11:27 +08:00
PC-202302260912\Administrator cf2ac5c893 loading 界面显示修改提交 2024-04-18 15:37:33 +08:00
PC-202302260912\Administrator 132967b3f5 loading图修改提交 2024-04-18 13:52:27 +08:00
PC-202302260912\Administrator 196af02806 替换图片 2024-04-18 11:54:50 +08:00
PC-202302260912\Administrator 3b18d59ce9 修改颜色 2024-04-18 11:17:16 +08:00
PC-202302260912\Administrator 308b473536 修改飞升预览显示 2024-04-17 21:08:22 +08:00
DESKTOP-MMO982B\User ed72d373a7 文案颜色修改 2024-04-20 19:26:15 +08:00
PC-202302260912\Administrator edb09b5391 送神祠title 修改提交 2024-04-17 19:19:06 +08:00
PC-202302260912\Administrator 2461fe8006 小兵战斗界面修改 2024-04-17 18:55:55 +08:00
PC-202302260912\Administrator b856431766 小兵spine 显示修改提交 2024-04-17 18:09:51 +08:00
PC-202302260912\Administrator 6681e52bbf 羁绊报错修改提交 2024-04-17 16:43:02 +08:00
PC-202302260912\Administrator 006c840e61 羁绊入口提交 2024-04-17 16:10:57 +08:00
PC-202302260912\Administrator 1b213010d9 专武活动红点 2024-04-17 15:12:17 +08:00
PC-202302260912\Administrator 576f7b6227 羁绊修改提交 2024-04-17 11:37:46 +08:00
PC-202302260912\Administrator 0ab95c5ad5 Merge branch 'tcx_xiyou_dev' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua
2024-04-17 10:13:51 +08:00
PC-202302260912\Administrator e630a11d81 图鉴提交 2024-04-17 10:11:12 +08:00
DESKTOP-MMO982B\User cbb6593ad1 功能名称修改 2024-04-16 18:56:03 +08:00
PC-202302260912\Administrator 1f885d7974 优化页面 2024-04-16 18:35:24 +08:00
DESKTOP-MMO982B\User c4e4978b17 魂印-法术、灵兽-神兽、神兵-神器、神印-天书、宝物-灵符、特训-修炼、特训岛-福地 2024-04-16 18:21:19 +08:00
PC-202302260912\Administrator b06b7ee762 修改颜色 2024-04-16 17:24:59 +08:00
PC-202302260912\Administrator 795bc2a2ae 优化页面 2024-04-16 16:21:30 +08:00
PC-202302260912\Administrator f37ba8ea1c 优化页面 2024-04-16 15:24:08 +08:00
PC-202302260912\Administrator 9df8bad7e1 小兵显示修改提交 2024-04-15 18:37:48 +08:00
PC-202302260912\Administrator 953cbcd6b2 助阵提交 2024-04-15 18:06:06 +08:00
PC-202302260912\Administrator d2bfa54e47 Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider 2024-04-15 17:52:08 +08:00
PC-202302260912\Administrator 150c1bf31b 优化页面 2024-04-16 17:32:26 +08:00
PC-202302260912\Administrator e9e96de912 优化页面 2024-04-16 16:30:00 +08:00
PC-202302260912\Administrator 69142fdc08 Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider 2024-04-15 11:25:56 +08:00
PC-202302260912\Administrator 70127942ea Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
2024-04-11 16:21:50 +08:00
PC-202302260912\Administrator 9762bfbfb8 英雄礼物修改 2024-04-11 15:16:26 +08:00
PC-202302260912\Administrator 580bf0902f 英雄图鉴显示修改 2024-04-11 14:33:07 +08:00
PC-202302260912\Administrator a2e1218fb9 多对塔秘宝入口修改 2024-04-11 14:11:27 +08:00
PC-202302260912\Administrator d93ad845dd 多对塔秘宝修改 2024-04-11 11:48:24 +08:00
PC-202302260912\Administrator 9c9b19a785 连续礼包修改 2024-04-10 22:34:54 +08:00
PC-202302260912\Administrator 19b6f918cd 连购显示修改 2024-04-10 19:32:48 +08:00
PC-202302260912\Administrator ed08a733c7 连续礼包处理 2024-04-10 19:29:26 +08:00
PC-202302260912\Administrator f0fb44c1be 主角礼物星级显示修改提交 2024-04-10 18:50:38 +08:00
PC-202302260912\Administrator 26faddf695 宝石 2024-04-11 19:14:56 +08:00
PC-202302260912\Administrator 491c60c572 优化页面 2024-04-10 18:24:52 +08:00
PC-202302260912\Administrator f1590fd206 灵兽密卷红点 及报错修改 2024-04-10 18:20:41 +08:00
PC-202302260912\Administrator 6c578a3358 法宝聚灵显示修改 2024-04-10 17:46:36 +08:00
PC-202302260912\Administrator 905cce0946 分解神兵显示修改 2024-04-10 17:43:32 +08:00
PC-202302260912\Administrator ade691a437 品质框修改 2024-04-10 17:11:30 +08:00
PC-202302260912\Administrator e404e42f5c 羁绊添加潜能等级提交 2024-04-10 16:52:46 +08:00
PC-202302260912\Administrator 34859033ce 品质框 2024-04-10 16:29:59 +08:00
PC-202302260912\Administrator 92203aceef 心愿概率修改 2024-04-10 16:25:36 +08:00
PC-202302260912\Administrator 7e67ea5920 英雄信息界面修改
(cherry picked from commit a1163cf81b)
2024-04-10 14:22:42 +08:00
PC-202302260912\Administrator ea5f5136cb 优化弹出 2024-04-15 12:32:37 +08:00
PC-202302260912\Administrator 3373701eba Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider 2024-04-10 11:28:27 +08:00
PC-202302260912\Administrator 0006fc0932 送神祠修改 2024-04-09 19:04:17 +08:00
DESKTOP-MMO982B\User 422d6654cc 神印突破等级和突破加成颜色修改 2024-04-09 15:37:04 +08:00
PC-202302260912\Administrator e85bfff5c2 小兵属性刷新修改 2024-04-09 15:11:59 +08:00
PC-202302260912\Administrator ce342b4bae 小兵boss血量下降太慢修改 2024-04-08 18:54:39 +08:00
PC-202302260912\Administrator f683040488 小兵战斗界面修改 2024-04-08 18:40:42 +08:00
PC-202302260912\Administrator 9ca8eceb5b Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider 2024-04-08 18:35:21 +08:00
PC-202302260912\Administrator a1163cf81b 英雄信息界面修改 2024-04-08 18:32:29 +08:00
PC-202302260912\Administrator d3ee1c33e1 【礼物】=================礼物升星提交 2024-04-08 16:40:40 +08:00
PC-202302260912\Administrator 8175e88c1b Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab
2024-04-08 15:14:50 +08:00
PC-202302260912\Administrator f8814f9b15 优化字体颜色 2024-04-07 17:54:23 +08:00
PC-202302260912\Administrator ca563cba6a 优化字体颜色 2024-04-07 17:44:04 +08:00
PC-202302260912\Administrator a5989022b3 后台挂机修改提交,添加关卡限制 2024-04-07 17:23:29 +08:00
DESKTOP-MMO982B\User fb3c50a4b6 灵兽,法宝,坐骑,神兵相关界面文字颜色修改 2024-04-07 16:40:08 +08:00
PC-202302260912\Administrator fefb780c56 小兵升级修改 2024-04-07 14:43:42 +08:00
PC-202302260912\Administrator d63f5f1efc Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewNewPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab
2024-04-07 14:03:12 +08:00
DESKTOP-RH64908\Administrator 9faf16c17f 特训显示修改 2024-04-03 17:51:01 +08:00
wangzhenxing ed1d27394e 特训修改 2024-04-03 17:49:57 +08:00
PC-202302260912\Administrator 9dc98ad4ce 排行榜红点修改提交
(cherry picked from commit 04da219a6f)
2024-04-03 17:47:49 +08:00
PC-202302260912\Administrator 7350b2f7fa 排行榜加名称 2024-04-03 17:47:14 +08:00
PC-202302260912\Administrator 3b11981b1d 小兵等级信息修改提交 2024-04-03 17:43:23 +08:00
PC-202302260912\Administrator 360d8c71e1 小兵添加多血条显示 2024-04-02 18:47:44 +08:00
PC-202302260912\Administrator 2e8610795a 英雄特训信息显示修改 2024-04-02 16:24:13 +08:00
PC-202302260912\Administrator ddba1eb67a 特训添加吃神兵 2024-04-02 15:11:59 +08:00
PC-202302260912\Administrator 0c0996187f 红点修改提交 2024-04-01 17:32:41 +08:00
PC-202302260912\Administrator a6484b1521 小兵修改提交 2024-04-01 17:07:45 +08:00
PC-202302260912\Administrator 04da219a6f 排行榜红点修改提交 2024-04-01 16:37:15 +08:00
PC-202302260912\Administrator 173b097eba 主城排行榜添加关卡进度排行榜 2024-04-01 16:26:11 +08:00
PC-202302260912\Administrator 58b97c7152 小兵等级添加红点 2024-04-01 15:47:03 +08:00
PC-202302260912\Administrator efb714863e 小兵修改提交 2024-04-01 15:12:36 +08:00
PC-202302260912\Administrator f9d180ea53 小兵提交 2024-03-29 19:25:56 +08:00
PC-202302260912\Administrator 9921316049 小兵属性修改提交 2024-03-29 18:16:28 +08:00
PC-202302260912\Administrator fd3ac0926a 小兵替换战力变化添加显示 2024-03-29 17:29:25 +08:00
PC-202302260912\Administrator b55e3bbe71 击败boss特效修改 2024-03-29 16:20:28 +08:00
PC-202302260912\Administrator 6083ced4be 小兵挂机奖励显示修改 2024-03-29 16:04:06 +08:00
PC-202302260912\Administrator f379b76dfd 挂机修改 2024-03-29 11:53:40 +08:00
PC-202302260912\Administrator 441e80ed07 小兵抽取界面提交 2024-03-28 19:07:53 +08:00
PC-202302260912\Administrator 84be275ca1 小兵显示修改提交 2024-03-28 16:21:39 +08:00
PC-202302260912\Administrator 74ed832ac6 显示挂机关卡层数 2024-03-28 15:22:30 +08:00
PC-202302260912\Administrator 4b3313875b 小兵信息战斗变化显示修改 2024-03-28 14:50:12 +08:00
PC-202302260912\Administrator b53c9e9a25 挂机产出显示修改 2024-03-28 11:47:07 +08:00
PC-202302260912\Administrator e8867a746f 获取新小兵时不显示自动替换信息 2024-03-26 18:55:16 +08:00
PC-202302260912\Administrator b9b1d46899 挂机小兵战斗力实时修改 2024-03-26 18:31:42 +08:00
PC-202302260912\Administrator b84ff2b1d9 小兵挂机修改 2024-03-22 18:56:32 +08:00
PC-202302260912\Administrator 9f61f2cc0a 挂机界面刷新boss关卡显示 2024-03-22 18:18:17 +08:00
PC-202302260912\Administrator ec01784076 Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider 2024-03-22 18:17:11 +08:00
PC-202302260912\Administrator 008056935c 小兵战斗添加血条 2024-03-22 17:38:21 +08:00
PC-202302260912\Administrator 9c37c03ec4 七界秘宝页面修改 2024-03-22 16:54:27 +08:00
PC-202302260912\Administrator b73f51af89 新竞技场排行榜显示修改 2024-03-22 16:33:43 +08:00
PC-202302260912\Administrator 5e14cc49e5 小兵战斗 添加后台战斗 2024-03-22 16:28:04 +08:00
PC-202302260912\Administrator d108dd850a 添加查看上阵小兵信息界面 2024-03-21 18:20:32 +08:00
PC-202302260912\Administrator a01b5c220c Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2024-03-21 15:37:17 +08:00
PC-202302260912\Administrator 46249d150d 新竞技场名称显示修改 2024-03-21 15:20:45 +08:00
PC-202302260912\Administrator 38c9947b89 关卡修改 2024-03-21 11:37:43 +08:00
PC-202302260912\Administrator ab96faa0dd 新竞技场修改 2024-03-21 11:07:50 +08:00
PC-202302260912\Administrator 072c07c302 在线奖励界面预设修改 2024-03-20 19:04:58 +08:00
PC-202302260912\Administrator 3404cd9d2d 新竞技场提交 2024-03-20 18:49:43 +08:00
PC-202302260912\Administrator 4b9a2cca1e 挂机修改提交 2024-03-20 15:50:34 +08:00
PC-202302260912\Administrator 718e52d874 显示战斗力变化 2024-03-19 19:13:34 +08:00
PC-202302260912\Administrator bc0df7acec 挂机显示修改 2024-03-19 18:43:17 +08:00
PC-202302260912\Administrator 7f62ec9ca4 挂机打boss 伤害字显示修改 2024-03-19 18:23:34 +08:00
PC-202302260912\Administrator ed52d28aa0 Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider 2024-03-19 17:47:48 +08:00
PC-202302260912\Administrator 96258981ad 挂机战斗修改提交 2024-03-19 17:47:02 +08:00
PC-202302260912\Administrator 9ceed272b4 全民福利 2024-03-19 11:50:48 +08:00
PC-202302260912\Administrator 344270edab 被动485修改提交 2024-03-18 14:02:37 +08:00
PC-202302260912\Administrator 8b19a40003 周卡页面替换 2024-03-14 15:58:03 +08:00
PC-202302260912\Administrator 506a11bd07 小兵等级信息界面修改提交 2024-03-13 19:07:44 +08:00
PC-202302260912\Administrator eeb51a7aaa 小兵提交 2024-03-13 18:56:19 +08:00
PC-202302260912\Administrator 45d34c1fe8 名望特权 2024-03-12 18:59:09 +08:00
PC-202302260912\Administrator ae457a802c 8日登录页面修改 2024-03-11 16:20:42 +08:00
lichao 08cff7d1bd 修改页签 2024-02-28 10:12:46 +08:00
DESKTOP-RH64908\Administrator 67aef02254 奖励字体颜色修改 2024-02-27 19:20:33 +08:00
lichao 775ba963ad 身外化身提交 2024-02-25 14:56:36 +08:00
lichao cc03db9ada 身外化身提交 2024-02-24 17:30:26 +08:00
sean 7c13e514a5 rm log 2024-02-24 16:38:01 +08:00
sean 6be9611538 灵兽ui优化 2024-02-24 12:21:30 +08:00
DESKTOP-C3M45P4\dengdan 696c540897 替换部分ui 2024-02-23 19:12:53 +08:00
tourist 23c45b7334 竞技场修改提交 2024-01-30 20:47:04 +08:00
sean 9a157d773f 灵兽 2024-01-30 20:18:10 +08:00
lichao 4c1570a6e4 预设修改 2024-01-30 15:33:57 +08:00
lichao 8a7c3eec17 主角第一版 2024-01-30 10:29:37 +08:00
lichao 9c99306cdc 灵脉修改 2024-01-29 17:36:57 +08:00
lichao 989c0abeeb 灵脉 2024-01-27 20:11:42 +08:00
sean cabe76113f 魂印 2024-01-20 16:45:29 +08:00
tourist 9f785b11b4 觉醒 技能界面调整 2024-01-20 15:35:23 +08:00
sean 43cb85f396 Merge branch 'tcx_xiyou_dev' of https://miduohuyu.com/root/miduo_client into tcx_xiyou_dev 2024-01-20 15:21:56 +08:00
sean 59fa5cea2b 好友、聊天 2024-01-20 15:21:05 +08:00
lichao d4e9759516 图鉴布阵 2024-01-20 14:28:07 +08:00
lichao 1497f3d044 图鉴修改 2024-01-20 11:56:07 +08:00
sean b7f989e02c z主城、好友 2024-01-20 00:38:46 +08:00
tourist 42b1bf6c19 英雄详情界面调整 2024-01-19 17:35:32 +08:00
lichao 29607e21c9 预设调整 2024-01-19 15:27:18 +08:00
tourist 777c793670 心魔提交 2024-01-19 14:47:41 +08:00
lichao 3459af2d7a 预设修改 2024-01-19 11:17:56 +08:00
sean 7ee46a3eb3 优化英雄界面 2024-01-19 21:49:54 +08:00
tourist 26bae4e6ef 心魔试炼 2024-01-18 21:00:45 +08:00
lichao db71627c34 预设修改 2024-01-18 20:36:51 +08:00
lichao cfd3378d93 预设修改 2024-01-18 20:06:52 +08:00
sean 2386350df6 英雄界面优化 2024-01-19 20:01:17 +08:00
sean eb98c17c69 背包资源替换 2024-01-19 15:33:22 +08:00
tourist 603ed2134d 山河 2024-01-18 09:51:51 +08:00
sean 328c0e0700 替换灵域 2024-01-18 21:38:32 +08:00
sean df9b83a3cb 副本 - 轩辕 2024-01-17 22:34:16 +08:00
lichao 818c8ebe34 封神 2024-01-16 20:48:46 +08:00
sean 29c823b4c7 挑战副本 2024-01-17 13:29:16 +08:00
tourist cf16d09d76 天赋装备预设修改 2024-01-15 20:56:45 +08:00
sean 918ba94a5d 查漏补缺 2024-01-14 17:11:25 +08:00
sean 31475f51a7 公会优化 2024-01-14 11:59:20 +08:00
sean 9a068429d5 【公会】 # 车迟斗法 2024-01-14 11:08:07 +08:00
sean 9d743a2cb9 公会大厅 2024-01-13 20:52:00 +08:00
tourist d4fa078d07 神将飞升进阶预览界面提交 2024-01-13 18:23:40 +08:00
lichao 21c7253f19 备战测试版 2024-01-13 17:16:34 +08:00
tourist a6e3cfa0c9 签到提交 2024-01-13 16:09:13 +08:00
tourist 3dff57ba2c 详情界面调整 2024-01-12 16:23:47 +08:00
sean f6f7e5e6f5 Merge branch 'tcx_xiyou_dev' of https://miduohuyu.com/root/miduo_client into tcx_xiyou_dev 2024-01-12 13:23:10 +08:00
sean 50673530c4 【公会 -- 援助】 2024-01-12 13:22:49 +08:00
tourist aa4195f74a 主城界面调整 2024-01-12 11:23:37 +08:00
sean 146b65a061 创建公会、通用消耗提示、公会祭祀、十绝阵 2024-01-12 10:09:51 +08:00
tourist 14d3d74c8d 英雄详情界面 2024-01-11 17:32:08 +08:00
tourist 26c5173166 培养线相关 2024-01-11 15:01:11 +08:00
tourist cf11810a1c 装备神魂界面修改 2024-01-10 20:22:10 +08:00
tourist 6e4949edde 英雄详情提交 2024-01-09 20:17:45 +08:00
sean dd7beaa11e 背包、主角信息、修改名字 2024-01-09 09:41:27 +08:00
yuanshuai 5a33095342 卡库界面修改 2024-01-08 19:39:00 +08:00
yuanshuai a71374d2f0 主界面初改 2024-01-08 11:18:55 +08:00