Commit Graph

12 Commits (cf24fa1eacacef0493388aedacc0e830eff2ae07)

Author SHA1 Message Date
PC-202302260912\Administrator e911b8ec9d Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into ShaoNv
# Conflicts:
#	Assets/ManagedResources/BG/UI/1All/Qualifying_d03.png.meta
#	Assets/ManagedResources/Prefabs/UI/Compound/SelectGiftListPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayListPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyTenPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/SecretBox/WishEquipBuyTenPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
2024-12-29 15:32:45 +08:00
PC-202302260912\Administrator ac556a981f loading图修改 2024-11-16 17:01:54 +08:00
PC-202302260912\Administrator ff7b956505 loading相关 2023-11-08 19:10:09 +08:00
JieLing 530374e00b 【资源】循环引用资源优化 2021-06-10 22:53:11 +08:00
JLIOSM1 cab9724de6 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
jiaoyangna b4da5effa6 白片修改提交 2021-03-02 18:29:15 +08:00
JieLing 4160de484a 【删除多余文件】 2021-02-20 18:02:30 +08:00
gaoxin 150d00e064 【资源】法宝资源添加,meta文件提交 2021-01-30 13:23:06 +08:00
jiaoyangna 0bb880e3a3 loading 2021-01-27 13:42:05 +08:00
gaoxin af532fce6e 海外相关修改合并 2020-08-22 16:19:50 +08:00
gaoxin 5ed5f7b8c4 修改Loading界面资源位置 2020-08-03 18:49:24 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00