miduo_client/Assets/ManagedResources/Atlas/MainAtlas
xiejun c47462c5d8 Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-09-20 18:57:44 +08:00
..
ArtFont Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-09-20 18:57:44 +08:00
ArtFont.meta
r_jyxz_anniu.png
r_jyxz_anniu.png.meta
r_shezhi_chahuadi.png
r_shezhi_chahuadi.png.meta
r_shezhi_di.png
r_shezhi_di.png.meta
r_shezhi_kaiguan_01.png
r_shezhi_kaiguan_01.png.meta
r_zjm_lingqu.png
r_zjm_lingqu.png.meta
r_zjm_lingqu2.png
r_zjm_lingqu2.png.meta
r_zjm_liwu.png
r_zjm_liwu.png.meta
r_zjm_qiridenglv.png
r_zjm_qiridenglv.png.meta
r_zjm_richang.png
r_zjm_richang.png.meta
r_zjm_suoding_002.png
r_zjm_suoding_002.png.meta
r_zjm_tequan 1.png
r_zjm_tequan 1.png.meta
r_zjm_tujian.png
r_zjm_tujian.png.meta
r_zjm_yaoshoutuxi.png
r_zjm_yaoshoutuxi.png.meta
r_zjm_zhangjiejiangli.png
r_zjm_zhangjiejiangli.png.meta
r_zjm_zszd.png
r_zjm_zszd.png.meta