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
..
ElementDrawCardPanel.prefab	…
ElementDrawCardPanel.prefab.meta	…
ElementDrawCardPanelNew.prefab	修改部分系统的按钮样式	2022-11-30 21:51:06 +08:00
ElementDrawCardPanelNew.prefab.meta	…
HeroPreviewNewPanel.prefab	预设修改提交	2022-04-26 11:51:51 +08:00
HeroPreviewNewPanel.prefab.meta	[抽卡奖池]======抽卡奖池预览修改	2022-01-17 15:56:27 +08:00
HeroPreviewPanel.prefab	…
HeroPreviewPanel.prefab.meta	…
RecruitEquipPanelNew.prefab	法宝心愿修改提交	2023-06-06 15:57:53 +08:00
RecruitEquipPanelNew.prefab.meta	法宝心愿修改提交	2023-06-06 15:57:53 +08:00
RecruitMainPanel.prefab	Merge branch 'dev_oneDis' into onepiece_demo	2023-08-29 17:58:24 +08:00
RecruitMainPanel.prefab.meta	…
RecruitPanel.prefab	…
RecruitPanel.prefab.meta	…
RecruitPanelNew.prefab	修改部分系统的按钮样式	2022-11-30 21:51:06 +08:00
RecruitPanelNew.prefab.meta	…
SingleRecruitPanel.prefab	挂机奖励预览修改	2022-12-06 11:07:34 +08:00
SingleRecruitPanel.prefab.meta	…
TenRecruitPanel.prefab	修改部分系统按钮样式	2022-12-01 15:35:21 +08:00
TenRecruitPanel.prefab.meta	…