Commit Graph

447 Commits (89cc2595e1b8d77d5f7146eee0b4b4c70d53e6da)

Author SHA1 Message Date
DESKTOP-RH64908\Administrator 8d4c3a2213 1 2025-02-10 20:20:21 +08:00
PC-202302260912\Administrator 19c908f543 页面再次优化 2024-10-30 17:57:16 +08:00
zhangjiannan 19484d6b62 Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Icon/Haizeiskill.meta
#	Assets/ManagedResources/Icons/luofu_huobi_1.png
#	Assets/ManagedResources/Icons/luofu_huobi_1.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_2.png
#	Assets/ManagedResources/Icons/luofu_huobi_2.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_3.png
#	Assets/ManagedResources/Icons/luofu_huobi_3.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_4.png
#	Assets/ManagedResources/Icons/luofu_huobi_4.png.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab
#	Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab
#	Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
2024-10-11 16:36:50 +08:00
PC-202302260912\Administrator e8a1bf84da 推进城 改为宇宙生成挑战 2024-09-12 19:37:04 +08:00
PC-202302260912\Administrator 971ba9b2a5 替换文字 2024-09-12 19:29:03 +08:00
wangzhenxing 7f96de523a 罗浮争锋修改提交 2024-06-19 15:29:54 +08:00
wangzhenxing 6074cf7a38 罗浮编队提示修改 2024-06-18 15:16:45 +08:00
wangzhenxing 0d5d64dd04 罗浮争锋修改提交================== 2024-06-18 14:27:45 +08:00
PC-202302260912\Administrator 0cfc87192e 优化页面 2024-03-07 17:09:44 +08:00
xiejun 698dad8d89 预制体修改 2024-02-02 18:27:37 +08:00
wangzhenxing ea592a85ad 修行挑战显示资源条修改 2024-01-24 18:06:10 +08:00
wangzhenxing 3079280262 罗浮争锋名称修改 2024-01-22 18:01:26 +08:00
wangzhenxing 6a053ea36f 副本排行榜描述修改 2024-01-20 20:26:09 +08:00
wangzhenxing 06a1b0ea97 四海试炼上阵界面修改 2024-01-15 19:11:29 +08:00
wangzhenxing e4299072f4 名称替换 2023-12-07 00:09:44 +08:00
wangzhenxing 966755fd6a 备战界面修改提交 2023-12-06 19:40:45 +08:00
xiejun 3aba3f4bee 伟大航路UI 2023-12-06 18:59:38 +08:00
wangzhenxing bc2603a3f2 备战界面设置界面修改 2023-11-13 15:34:29 +08:00
wangzhenxing 793daedcb4 英雄列表阵容显示修改 2023-11-06 14:55:59 +08:00
wangzhenxing d972e70e05 推荐阵容修改提交 2023-11-02 18:10:22 +08:00
xiejun 83a8e9ab56 修改 2023-09-01 18:27:39 +08:00
xiejun f549956ebb 新预制体已经公会和活动ui 2023-08-28 11:34:43 +08:00
xiejun 734cb92be9 去掉pating和spriteloader相关的代码 2023-08-16 11:55:55 +08:00
yuanshuai db1e9a9305 时空职业bug修改 2023-05-08 11:21:53 +08:00
wangzhenxing 42aeb38e6f 多队塔编对修改提交 2023-04-20 13:13:22 +08:00
wangzhenxing a1c038b5c0 新英雄宝物修改提交 2023-04-19 13:49:21 +08:00
wangzhenxing 5999c18900 新英雄上阵修改提交 2023-04-18 15:34:22 +08:00
wangzhenxing 91b1bbb82c 遴选多队塔代码 2023-03-21 10:58:00 +08:00
wangzhenxing 6d55ae95d7 Revert "多队塔提交"
This reverts commit 4a411833a5.
2023-03-20 11:42:40 +08:00
wangzhenxing 4a411833a5 多队塔提交 2023-03-20 11:22:44 +08:00
wangzhenxing b3b95119c0 备战界面星级显示修改 2023-01-12 16:47:04 +08:00
wangzhenxing 6a2b5b8b09 推荐阵容调整位置 加红点 2023-01-10 16:39:58 +08:00
wangzhenxing 4ca7445e8b 跳过战斗修改 2023-01-04 18:16:08 +08:00
wangzhenxing 7a66818c2e 备战界面星级显示修改 2022-12-22 14:21:59 +08:00
wangzhenxing a6bd546897 玉虚轮道备战星级修改 2022-12-20 15:07:17 +08:00
wangzhenxing bef029e5ca 战斗跳过添加开启条件 2022-12-12 15:43:33 +08:00
wangzhenxing 2d35f6f270 [bt]======添加战斗跳过 2022-12-07 11:41:20 +08:00
yuanshuai 1ebe336d52 阵容推荐修改 2022-11-29 17:11:21 +08:00
wangzhenxing c5921ae680 [玉虚论道]=====编队英雄详情修改提交 2022-09-02 13:58:13 +08:00
wangzhenxing bdc2cd7ef9 [玉虚论道]=====玉虚论道修改 2022-09-01 18:15:08 +08:00
wangzhenxing e3b1b3a967 [玉虚论道]=====星级,等级显示修改 2022-09-01 17:05:24 +08:00
yuanshuai 1e6d693209 山河设计图分页请求修改 2022-05-05 16:46:33 +08:00
yuanshuai 99ae5cb8ec 探索界面保存编队逻辑优化 2022-04-28 16:12:33 +08:00
yuanshuai bf52645eb7 挑战副本优化 2022-04-25 18:20:53 +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
wangzhenxing 2ed317bc2c 摘星阁修改,备战阵营图标显示修改 2022-04-07 15:09:04 +08:00