Commit Graph

150 Commits (033c0c638458bacc65931d58bf40c40aa4bb59a1)

Author SHA1 Message Date
zhangjiannan 033c0c6384 1 2025-12-25 21:10:11 +08:00
zhangjiannan 240712fb15 1 2025-12-25 21:04:10 +08:00
zhangjiannan 05252a968f 1 2025-12-25 20:54:49 +08:00
zhangjiannan 8c2677df0a 1 2025-12-25 20:38:31 +08:00
zhangjiannan dadfa88620 1 2025-12-24 19:00:18 +08:00
zhangjiannan d7d530f954 1 2025-12-24 12:20:49 +08:00
zhangjiannan 52c099c53d 1 2025-12-23 19:05:45 +08:00
zhangjiannan a3f9c6700d 1 2025-12-15 18:42:53 +08:00
zhangjiannan 59a5ae3ec0 no message 2025-03-14 11:58:20 +08:00
zhangjiannan 3d36aaf1ee 1 2024-09-24 19:03:43 +08:00
zhangjiannan bcb7c1180d 多语言改脚本 2024-09-20 17:32:50 +08:00
zhangjiannan b25ac62235 格式化脚本 2024-09-06 10:38:56 +08:00
DESKTOP-MMO982B\User 66a1580380 本地化 2024-08-29 21:36:51 +08:00
PC-202302260912\Administrator b145778c05 玉虚奖励页面优化 2024-07-09 11:04:57 +08:00
wangzhenxing 5ff24be568 玉虚轮道修改提交
(cherry picked from commit 510cbe9070)
2024-06-24 19:21:34 +08:00
wangzhenxing e2f5de9ef1 玉虚论道修改提交
(cherry picked from commit 5488167a03)
2024-06-24 19:21:22 +08:00
PC-202302260912\Administrator 996cef7888 排行榜奖励字体颜色调整
(cherry picked from commit e0ca7a1435)
2024-06-24 19:20:28 +08:00
PC-202302260912\Administrator 6aa5d47657 玉虚论道页面修改
(cherry picked from commit d9ba8aecbd)
2024-06-24 19:20:10 +08:00
PC-202302260912\Administrator e40806ebbd 玉虚界面调整
(cherry picked from commit c7882cb253)
2024-06-24 19:20:01 +08:00
PC-202302260912\Administrator 85c9ad1569 排行榜页面调整
(cherry picked from commit 5552718d8f)
2024-06-24 19:19:50 +08:00
wangzhenxing f02371a3ef 玉虚轮道等级 星级显示修改 2024-06-20 11:48:59 +08:00
wangzhenxing a278ca3e8c 封神之路对战界面等级显示修改 同bt
(cherry picked from commit 2c1cc86435)
2024-05-22 19:16:24 +08:00
wangzhenxing 4bb74a24f0 多对塔开战添加阵容判断,相同英雄判断 同bt
(cherry picked from commit 793fc3a5bc)
2024-05-20 14:55:08 +08:00
PC-202302260912\Administrator 490fcfdee4 多对塔挂机宝箱修改 2024-05-11 18:09:04 +08:00
PC-202302260912\Administrator a58c35d412 封神之路修改 2024-04-28 19:37:57 +08:00
PC-202302260912\Administrator 3b18d59ce9 修改颜色 2024-04-18 11:17:16 +08:00
PC-202302260912\Administrator 3404cd9d2d 新竞技场提交 2024-03-20 18:49:43 +08:00
wangzhenxing 8800ec962b 封神之路双队塔开启条件修改 2023-08-09 13:54:59 +08:00
wangzhenxing 42aeb38e6f 多队塔编对修改提交 2023-04-20 13:13:22 +08:00
wangzhenxing 6d3fe931d3 [神兵]==============修改提交 2023-04-12 11:31:04 +08:00
wangzhenxing a2726648ff 多队塔战斗判定修改提交 2023-03-23 16:57:29 +08:00
wangzhenxing f65a4314d1 多队塔胜利条件修改 2023-03-23 10:43:53 +08:00
wangzhenxing 1fa9ba8050 多队塔详情界面挑战添加限制 2023-03-22 18:26:47 +08:00
wangzhenxing 04a84da290 多队塔红点提交 2023-03-22 14:58:19 +08:00
wangzhenxing 614ec0b6e1 多队塔排行榜显示修改提交 2023-03-22 10:45:26 +08:00
wangzhenxing 4848d707ff 多队塔修改提交 2023-03-21 16:12:57 +08:00
wangzhenxing 91b1bbb82c 遴选多队塔代码 2023-03-21 10:58:00 +08:00
wangzhenxing 82ba7d45c4 Merge branch 'china/dev_bt' into china/dev_bt_develop
Conflicts:
	Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayOtherTeamPanel.prefab
	Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTreasurePanel.prefab
	Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua
	Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/GodsWayTreasurePanel.lua
	Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayOtherTeamPanel.lua
	Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua
2023-03-21 10:39:18 +08:00
wangzhenxing 6f9af97445 多队塔提交 2023-03-21 10:11:06 +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 693774b012 玉虚论道修改 2023-01-13 14:00:37 +08:00
wangzhenxing 59b4801c07 玉虚论道星级修改 2023-01-13 13:44:12 +08:00
wangzhenxing 051b6ae456 [玉虚]===他人阵容英雄背景框修改 2022-09-02 14:10:01 +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
wangzhenxing 1c715438c8 [玉虚论道]=======开战添加相同神将屏蔽提示 2022-05-25 13:58:31 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +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