miduo_client/Assets/ManagedResources/~Lua/Modules/Popup
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
..
View Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
BattleFailPopup.lua 遴选多队塔代码 2023-03-21 10:58:00 +08:00
BattleFailPopup.lua.meta
BattleWinPopup.lua 七界试炼bug修复 2023-05-08 15:00:52 +08:00
BattleWinPopup.lua.meta
BazzarPopup.lua
BazzarPopup.lua.meta
BoxRewardShowPopup.lua
BoxRewardShowPopup.lua.meta
CarbonBuyCountPopup.lua
CarbonBuyCountPopup.lua.meta
CarbonMissionPopup.lua
CarbonMissionPopup.lua.meta
CostConfirmPopup.lua
CostConfirmPopup.lua.meta
CreateNamePopup.lua 刷冲gm文字修改 2022-12-15 11:39:09 +08:00
CreateNamePopup.lua.meta
DiffmonsterEditPopup.lua
DiffmonsterEditPopup.lua.meta
DropGetPlayerDecorateShopPanel.lua
DropGetPlayerDecorateShopPanel.lua.meta
DropGetSSRHeroShopPanel.lua [战斗]======效果137修改 立绘朝向修改 2021-11-29 17:53:17 +08:00
DropGetSSRHeroShopPanel.lua.meta
ElementRestraintPopup.lua
ElementRestraintPopup.lua.meta
EquipInfoPopup.lua
EquipInfoPopup.lua.meta
FoodGainPopup.lua
FoodGainPopup.lua.meta
GeneralPopup.lua 摘星阁脚本预设提交 2022-09-01 17:30:15 +08:00
GeneralPopup.lua.meta
GeneralRewardPopup.lua
GeneralRewardPopup.lua.meta
HelpPopup.lua 【灵脉秘境】提交 2021-11-11 10:06:49 +08:00
HelpPopup.lua.meta
HeroReplacePopup.lua 神将置换功能提交 2023-02-16 18:11:55 +08:00
HeroReplacePopup.lua.meta 神将置换功能提交 2023-02-16 18:11:55 +08:00
HomeLandEquipPopup.lua Merge branch 'china/dev_bt_develop' into china/dev_bt 2023-05-08 17:42:35 +08:00
HomeLandEquipPopup.lua.meta 摘星阁脚本预设提交 2022-09-01 17:30:15 +08:00
ItemBoxDropPopup.lua 红包概率取整 2022-12-27 11:04:30 +08:00
ItemBoxDropPopup.lua.meta 宝箱红包类型道具获取概率弹窗 2022-12-07 18:26:11 +08:00
ItemGetPopup.lua
ItemGetPopup.lua.meta
MapBagPopup.lua
MapBagPopup.lua.meta
MapFormationInfoPopup.lua
MapFormationInfoPopup.lua.meta
MapNotePopup.lua
MapNotePopup.lua.meta
MapRoleInfoPopup.lua [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
MapRoleInfoPopup.lua.meta
MatchTipPopup.lua
MatchTipPopup.lua.meta
MonsterInfoPopup.lua
MonsterInfoPopup.lua.meta
MonsterSkillPopup.lua
MonsterSkillPopup.lua.meta
NameManager.lua [连冲返利]=====报错修改,名称敏感字符提示修改 2022-06-21 14:40:48 +08:00
NameManager.lua.meta
NextMonsterInfoPopup.lua
NextMonsterInfoPopup.lua.meta
PassGiftPopup.lua
PassGiftPopup.lua.meta
PlayerInfoPopup.lua Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
PlayerInfoPopup.lua.meta
PlayerInfoPopup_extra.lua 【灵脉秘境】提交 2021-11-18 14:10:57 +08:00
PlayerInfoPopup_extra.lua.meta 【灵脉秘境】提交 2021-11-17 16:14:47 +08:00
RewardEquipSingleShowPopup.lua
RewardEquipSingleShowPopup.lua.meta
RewardEquipSingleShowPopup2.lua 魂宝灵宝增加精炼技能,神印增加套装技能 2022-11-18 17:35:05 +08:00
RewardEquipSingleShowPopup2.lua.meta
RewardGemSingleShowPopup.lua Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-31 09:51:26 +08:00
RewardGemSingleShowPopup.lua.meta 【命格】命石替换 2021-12-08 14:17:18 +08:00
RewardItemPopup.lua Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
RewardItemPopup.lua.meta
RewardItemSingleShowPopup.lua 海贼UI 2023-07-27 18:37:04 +08:00
RewardItemSingleShowPopup.lua.meta
RewardRideShowPopup.lua 【玩家信息】提交 2022-01-15 13:07:28 +08:00
RewardRideShowPopup.lua.meta 【坐骑】增加详细信息 2022-01-15 13:00:45 +08:00
RewardTailsmanChipShowPopup.lua 查看其他玩家信息,变身卡信息不对bug 2022-04-26 17:20:19 +08:00
RewardTailsmanChipShowPopup.lua.meta 变身卡详情提交 2021-11-26 19:36:20 +08:00
RewardTalismanSingleShowPopup.lua
RewardTalismanSingleShowPopup.lua.meta
RewardTalismanSingleShowPopup2.lua 法相装备修改提交 2023-02-21 14:20:46 +08:00
RewardTalismanSingleShowPopup2.lua.meta 【新·魂灵宝】界面提交 2021-11-09 11:42:19 +08:00
RoleGetInfoPopup.lua 查看他人英雄技能修改提交 2022-05-19 22:24:02 +08:00
RoleGetInfoPopup.lua.meta
RoleInfoPopup.lua 助战法相信息显示修改 2023-03-10 13:29:22 +08:00
RoleInfoPopup.lua.meta
SettingPopup.lua
SettingPopup.lua.meta
SkillInfoPopup.lua 角色星级扩展 2022-11-02 16:26:40 +08:00
SkillInfoPopup.lua.meta
SoulPrintPopUp.lua 每日累充修改 魂印描述修改 2022-11-09 17:55:54 +08:00
SoulPrintPopUp.lua.meta
StoryOptionPopup.lua
StoryOptionPopup.lua.meta
SupremeHeroPopup.lua 【至尊降世】修复老活动跳转报错 2021-12-21 21:03:42 +08:00
SupremeHeroPopup.lua.meta
SupremeHeroPopupNew.lua 删除log 2022-02-23 18:34:10 +08:00
SupremeHeroPopupNew.lua.meta 至尊降世提交 2021-12-16 11:42:00 +08:00
TalismanInfoPopup.lua Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
TalismanInfoPopup.lua.meta
TrialBossTipPopup.lua
TrialBossTipPopup.lua.meta
TrialRewardBackPopup.lua 【ID1010911】 2021-12-30 18:06:36 +08:00
TrialRewardBackPopup.lua.meta 【ID1010911】 2021-12-30 18:06:36 +08:00
TrialRewardPopup.lua 【建木神树】提交 2022-01-08 10:33:31 +08:00
TrialRewardPopup.lua.meta
UnlockCheckpointPopup.lua
UnlockCheckpointPopup.lua.meta
View.meta
WishHeroRewardPopup.lua Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
WishHeroRewardPopup.lua.meta 法宝心愿修改提交 2023-06-06 15:57:53 +08:00