PC-202302260912\Administrator
|
6010ad2e9d
|
修改名字
|
2023-12-10 23:10:31 +08:00 |
xiejun
|
3aba3f4bee
|
伟大航路UI
|
2023-12-06 18:59:38 +08:00 |
wangzhenxing
|
344e68ff63
|
预设修改提交
|
2023-11-15 14:25:44 +08:00 |
wangzhenxing
|
4e04803971
|
多对塔修改
|
2023-11-14 18:34:01 +08:00 |
wangzhenxing
|
18afe46e8c
|
多对塔队伍信息界面修改
|
2023-11-13 14:28:33 +08:00 |
xiejun
|
c52bf49652
|
调整红点位置
|
2023-11-11 15:13:11 +08:00 |
xiejun
|
d6c57eb391
|
战令预制体修改
|
2023-11-11 15:03:03 +08:00 |
xiejun
|
100980e98b
|
删除老预制体
|
2023-10-23 17:51:23 +08:00 |
xiejun
|
83a8e9ab56
|
修改
|
2023-09-01 18:27:39 +08:00 |
xiejun
|
6ced2b0507
|
Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
# AssetBundles/version.txt
# Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
# Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
|
2023-08-29 17:58:24 +08:00 |
xiejun
|
4d8b08104c
|
七界资源
|
2023-08-28 18:52:15 +08:00 |
xiejun
|
f549956ebb
|
新预制体已经公会和活动ui
|
2023-08-28 11:34:43 +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 |