Commit Graph

13 Commits (f31491b8f9d120fb2dac4e7483d5424b67b2eee8)

Author SHA1 Message Date
lichao cfd3378d93 预设修改 2024-01-18 20:06:52 +08:00
lichao 818c8ebe34 封神 2024-01-16 20:48:46 +08:00
lichao 17ecff3994 修改预设 2024-01-16 18:28:39 +08:00
wangzhenxing 06b9371e79 多队塔秘宝修改提交 2023-04-12 15:33:19 +08:00
wangzhenxing 04a84da290 多队塔红点提交 2023-03-22 14:58:19 +08:00
wangzhenxing e45c2bcae1 Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop 2023-03-21 16:13:38 +08:00
wangzhenxing 4848d707ff 多队塔修改提交 2023-03-21 16:12:57 +08:00
lihaiyang 0eaa10d4d3 多队塔界面修改 2023-03-21 16:02:24 +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