Commit Graph

208 Commits (ebe1fe09123b70d314815fc5721ceda2fdae4021)

Author SHA1 Message Date
zhangjiannan ebe1fe0912 1 2026-04-28 17:22:54 +08:00
zhangjiannan d6b66729f3 1 2025-12-29 18:46:10 +08:00
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 7dec0e3a8f 1 2025-12-24 22:53:50 +08:00
zhangjiannan 988100e36e 1 2025-12-24 22:33:29 +08:00
zhangjiannan 52b67ef365 1 2025-12-24 21:31:16 +08:00
zhangjiannan bc27fb12f9 1 2025-12-24 21:16:43 +08:00
PC-202302260912\Administrator f9d86397af 预设搭配lua修正 2025-09-30 20:09:14 +08:00
zhangjiannan 59a5ae3ec0 no message 2025-03-14 11:58:20 +08:00
PC-202302260912\Administrator 16b471cfe8 越南語bug 2025-01-06 19:55:26 +08:00
PC-202302260912\Administrator f3b7e21835 1 2025-01-06 15:30:59 +08:00
PC-202302260912\Administrator 96bf8f6925 爬塔弹出不该弹出的页面 2025-01-02 15:32:36 +08:00
PC-202302260912\Administrator 08af2d3339 越南bug修改 2024-12-30 20:50:52 +08:00
zhangjiannan 85710322d2 修改多语言 2024-09-24 17:45:41 +08:00
zhangjiannan 86b321c08b 弹出框多语言 2024-09-19 20:14:12 +08:00
zhangjiannan b25ac62235 格式化脚本 2024-09-06 10:38:56 +08:00
DESKTOP-MMO982B\User d05a8366a4 本地化 2024-09-01 15:36:55 +08:00
DESKTOP-MMO982B\User 66a1580380 本地化 2024-08-29 21:36:51 +08:00
PC-202302260912\Administrator 61a7e6f224 心魔试炼关卡显示修改 同步常规 2024-05-16 14:50:43 +08:00
PC-202302260912\Administrator 95f693a499 小兵红点修改提交 2024-05-10 23:17:47 +08:00
PC-202302260912\Administrator 889ba23b84 心魔试炼红点修改 2024-05-06 11:10:01 +08:00
PC-202302260912\Administrator d5d06ec2f2 适配提交 2024-04-29 13:45:11 +08:00
PC-202302260912\Administrator c137f40ca3 多队塔修改 2024-04-28 18:13:18 +08:00
PC-202302260912\Administrator 85a1c55958 四灵屏蔽助战功能 2024-04-23 11:32:07 +08:00
PC-202302260912\Administrator a2e1218fb9 多对塔秘宝入口修改 2024-04-11 14:11:27 +08:00
tourist 26bae4e6ef 心魔试炼 2024-01-18 21:00:45 +08:00
lichao cfd3378d93 预设修改 2024-01-18 20:06:52 +08:00
sean 2386350df6 英雄界面优化 2024-01-19 20:01:17 +08:00
wangzhenxing 79d3af1390 多对塔秘宝修改 特训修改
(cherry picked from commit 452a77ea17)
2024-01-05 15:37:30 +08:00
wangzhenxing 6085b2193a 多对塔挑战修改 2023-09-06 14:43:33 +08:00
wangzhenxing f591f0c76e 快速挑战入口开启条件修改 2023-08-07 18:59:29 +08:00
wangzhenxing 49d7c26a39 心魔试炼快速挑战开启条件修改 2023-08-04 15:15:08 +08:00
PC-202302260912\Administrator 2987bc24a2 心魔试炼=================屏蔽神应显示 2023-07-14 11:24:26 +08:00
wangzhenxing 826f58ce6e 神兵提交 2023-03-28 13:57:59 +08:00
wangzhenxing 04a84da290 多队塔红点提交 2023-03-22 14:58:19 +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 5aeffabd6f 助战法相信息显示修改 2023-03-10 13:29:22 +08:00
wangzhenxing 84a9fd51f6 心魔挑战开启快速挑战 2023-02-13 18:33:35 +08:00
wangzhenxing 370ab94189 心魔试炼屏蔽快速挑战 2022-11-04 17:59:39 +08:00
wangzhenxing 16d6e211a3 神印四灵显示修改 2022-04-27 17:14:20 +08:00
wangzhenxing 9d772eab4c 【bug】=====心魔助战英雄修改 2022-04-06 16:21:34 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
gaoxin 61ce0ea1bc 【四灵试炼】修复选择四灵中佩戴唯一性的魂印的助战神将,会导致自己无法佩戴的问题 2022-03-15 18:23:52 +08:00
ZhangBiao 9c874f1789 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/Icon/Item/icon_laohu.png.meta
#	Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
2022-01-06 15:38:48 +08:00