miduo_client/Assets/ManagedResources/~Lua/Modules/Resolve/View
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
..
Resolve_Dismantle.lua 罗浮争锋修改提交 2024-06-19 15:29:54 +08:00
Resolve_Dismantle.lua.meta
Resolve_EquipTreasure.lua 分解英雄修改提交 2023-12-05 16:18:04 +08:00
Resolve_EquipTreasure.lua.meta
Resolve_GodWeapon.lua 名刀变超级武器 2024-09-12 16:12:17 +08:00
Resolve_GodWeapon.lua.meta
Resolve_Pokemon.lua 合并0.1新功能修改 2024-01-03 15:24:49 +08:00
Resolve_Pokemon.lua.meta
Resolve_Recall.lua 罗浮争锋修改提交 2024-06-19 15:29:54 +08:00
Resolve_Recall.lua.meta
Resolve_Talisman.lua 罗浮争锋修改提交 2024-06-19 15:29:54 +08:00
Resolve_Talisman.lua.meta