Commit Graph

10064 Commits (d9829f0314acbf89cc7c9e355a38e186fbe880c3)

Author SHA1 Message Date
PC-202302260912\Administrator bd04bea4c6 小兵添加战力,小兵自动抽卡提交 2024-04-26 18:00:38 +08:00
PC-202302260912\Administrator 82b5946448 去掉急速探索 2024-04-26 15:08:35 +08:00
PC-202302260912\Administrator 79359c6105 Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
2024-04-26 14:05:23 +08:00
PC-202302260912\Administrator 093aa70a12 挂机添加帮助 2024-04-26 13:55:15 +08:00
PC-202302260912\Administrator a94c36f785 引导首充修改 2024-04-26 13:45:42 +08:00
PC-202302260912\Administrator 431b6abfc7 引导修改提交 2024-04-26 00:56:17 +08:00
PC-202302260912\Administrator a39f1bb3ea 屏蔽魂印商店引导 2024-04-25 21:54:33 +08:00
PC-202302260912\Administrator 9fcf135a79 战斗页面调整 2024-04-25 21:52:05 +08:00
PC-202302260912\Administrator 704a9b44c6 多对塔名称修改 2024-04-25 20:51:54 +08:00
PC-202302260912\Administrator b35ff7e0ea 引导小手调快 2024-04-25 20:28:05 +08:00
PC-202302260912\Administrator 2aaf4d32a1 战斗背景修改 2024-04-25 19:51:33 +08:00
PC-202302260912\Administrator 23abc7d99b 商店修改,删除无用资源 2024-04-25 19:33:29 +08:00
PC-202302260912\Administrator a6a0458e35 山河页面修改 2024-04-25 19:14:34 +08:00
PC-202302260912\Administrator 8853836752 挂机修改 2024-04-25 18:59:38 +08:00
PC-202302260912\Administrator 77dd015050 开服狂欢修改 2024-04-25 18:24:55 +08:00
PC-202302260912\Administrator 6c475dac0b 送无限抽修改提交 2024-04-25 17:49:07 +08:00
PC-202302260912\Administrator f93d977e85 排行榜修改提交 2024-04-25 17:35:19 +08:00
PC-202302260912\Administrator 8251f884ce 助战英雄升星 助战加成属性修改 2024-04-25 16:21:43 +08:00
PC-202302260912\Administrator 2b1fc7734b 活动未选中按钮置灰 2024-04-25 16:02:32 +08:00
PC-202302260912\Administrator 8d6569aacb 图鉴修改 2024-04-25 15:35:31 +08:00
PC-202302260912\Administrator 2349eb93f3 设置界面修改 2024-04-25 15:09:47 +08:00
PC-202302260912\Administrator 67607a97a6 魂印修改提交 2024-04-25 14:39:12 +08:00
PC-202302260912\Administrator 74a363bb67 罗浮入口修改提交 2024-04-25 13:47:59 +08:00
PC-202302260912\Administrator f33e85aa5a Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua
2024-04-25 11:48:30 +08:00
PC-202302260912\Administrator 453292a5dd 命石详情修改 2024-04-25 11:32:49 +08:00
PC-202302260912\Administrator ef0812f1cd 助阵属性修改提交 2024-04-25 11:19:19 +08:00
PC-202302260912\Administrator 9799a7d983 小兵等级信息修改 2024-04-25 10:52:10 +08:00
PC-202302260912\Administrator 1bb7c1b179 删除无用图片 2024-04-24 19:51:55 +08:00
PC-202302260912\Administrator be8bea8c00 潜能修改提交 2024-04-24 19:25:05 +08:00
PC-202302260912\Administrator a26167541c 活动修改提交 2024-04-24 19:10:30 +08:00
PC-202302260912\Administrator 3a2e368e0e 主城功能入口移动位置修改 2024-04-24 18:39:30 +08:00
PC-202302260912\Administrator 85dbcde05c 排行榜显示通关修改 2024-04-24 18:24:55 +08:00
PC-202302260912\Administrator 7df4127911 引导修改 2024-04-24 18:11:52 +08:00
PC-202302260912\Administrator 936b73e6b3 罗浮提示修改 2024-04-23 18:29:27 +08:00
PC-202302260912\Administrator ba840c4d94 罗浮商店跳转修改 2024-04-23 18:21:25 +08:00
PC-202302260912\Administrator 491fffee19 字体颜色修改 2024-04-23 18:09:22 +08:00
PC-202302260912\Administrator f3b585cf54 罗浮不能上阵时空神将修改 2024-04-23 17:36:07 +08:00
PC-202302260912\Administrator eade566790 罗浮报名添加二次提示修改 2024-04-23 17:25:56 +08:00
PC-202302260912\Administrator 8e59f42fbd 罗浮修改 2024-04-23 17:16:09 +08:00
PC-202302260912\Administrator 1c88aac39c Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
2024-04-23 16:57:25 +08:00
PC-202302260912\Administrator af73951c45 小兵通关修改 2024-04-24 16:37:54 +08:00
PC-202302260912\Administrator 0c6cb97ec5 挂机修改提交 2024-04-24 15:52:30 +08:00
PC-202302260912\Administrator 74d0a40977 小兵后台挂机修改 2024-04-24 14:57:12 +08:00
PC-202302260912\Administrator 209fe80f09 挂机抽卡添加红点 2024-04-24 14:07:47 +08:00
PC-202302260912\Administrator 23ed322676 显示召唤修改 2024-04-24 11:29:33 +08:00
PC-202302260912\Administrator 440149acc6 小兵升级修改 2024-04-23 19:07:18 +08:00
PC-202302260912\Administrator 75111d8e4c 升级功能开启名字显示修改 2024-04-23 18:56:18 +08:00
PC-202302260912\Administrator f0d92289b6 礼物合成弹出详情修改 2024-04-23 16:54:54 +08:00
PC-202302260912\Administrator afc5e9caea 礼物合成修改 2024-04-23 16:50:07 +08:00
PC-202302260912\Administrator f2920efaab 法相物品详情显示修改 2024-04-23 16:32:53 +08:00
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