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
|
0b3cb6df94
|
生命卡修改为意念 预设修改
|
2024-09-12 18:34:47 +08:00 |
wangzhenxing
|
e5b6feddb1
|
法宝详情界面修改
|
2024-07-05 15:05:52 +08:00 |
xiejun
|
cabb20095f
|
生命卡
|
2024-01-16 18:32:53 +08:00 |
wangzhenxing
|
7a232cc185
|
生命卡修改提交
|
2024-01-16 11:21:17 +08:00 |
wangzhenxing
|
030431e3fc
|
合并0.1新功能修改
|
2024-01-03 15:24:49 +08:00 |
wangzhenxing
|
63e9a01c73
|
法宝改成生命卡
|
2023-12-08 21:57:53 +08:00 |
wangzhenxing
|
1c65cd4052
|
法灵修改
|
2023-10-27 16:16:37 +08:00 |
wangzhenxing
|
e795b4834b
|
法灵红点提交
|
2023-10-27 14:10:43 +08:00 |
wangzhenxing
|
ed4865cc3c
|
法宝星级显示修改
|
2023-10-26 20:44:18 +08:00 |
wangzhenxing
|
0d08ea1a84
|
法灵提交
|
2023-10-26 17:16:10 +08:00 |