miduo_client/Assets/ManagedResources/~Lua/Modules/GeneralPanel
jiaoyangna d83373ecab Merge branch 'china/dev' into tansuo
# Conflicts:
#	Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
#	Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/JumpViewNew.lua
#	Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
2021-12-27 17:00:14 +08:00
..
View Merge branch 'china/dev' into 0功能/命格 2021-12-20 14:07:56 +08:00
View2 Merge branch 'china/dev' into tansuo 2021-12-27 17:00:14 +08:00
View3
AttriTips.lua 【修行】增加属性提升提示 2021-06-01 13:54:21 +08:00
AttriTips.lua.meta 【修行】增加属性提升提示 2021-06-01 13:54:21 +08:00
CongratulationPopup.lua
CongratulationPopup.lua.meta
GeneralBigPopup.lua 【命格】提交 2021-12-09 13:29:16 +08:00
GeneralBigPopup.lua.meta
GeneralInfoPopup.lua Merge branch 'china/dev' into tansuo 2021-12-27 17:00:14 +08:00
GeneralInfoPopup.lua.meta
GeneralRankRewardPanel.lua 排行奖励切换奖励显示不正确修改 2021-11-24 07:24:17 +08:00
GeneralRankRewardPanel.lua.meta
GeneralSizeFitterPopup.lua 探索提交 2021-12-24 17:49:54 +08:00
GeneralSizeFitterPopup.lua.meta 探索提交 2021-12-23 13:09:34 +08:00
GeneralSizeFitterPopup_ExploreSelectFormation.lua 探索提交 2021-12-24 17:49:54 +08:00
GeneralSizeFitterPopup_ExploreSelectFormation.lua.meta 探索提交 2021-12-23 13:09:34 +08:00
GeneralSizeFitterPopup_OneKeyExplore.lua 探索提交 2021-12-27 16:31:38 +08:00
GeneralSizeFitterPopup_OneKeyExplore.lua.meta 探索提交 2021-12-23 13:09:34 +08:00
GeneralTreasureMangaer.lua 【七界试炼】提交 2021-09-24 19:23:30 +08:00
GeneralTreasureMangaer.lua.meta 【七界试炼】提交 2021-09-13 18:06:39 +08:00
GeneralTreasurePanel.lua 【七界试炼】提交 2021-09-23 16:08:02 +08:00
GeneralTreasurePanel.lua.meta 【七界试炼】提交 2021-09-13 18:06:39 +08:00
View.meta
View2.meta
View3.meta