miduo_client/Assets/ManagedResources/~Lua/Modules/GeneralPanel
ZhangBiao 1c191a78b9 Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
2021-09-22 11:46:24 +08:00
..
View Merge branch '0功能/玉虚论道' into 0功能/七界试炼 2021-09-22 11:46:24 +08:00
View2 【七界试炼】遗物 2021-09-13 13:54:58 +08:00
View3 【修行】this.spLoader提交 2021-05-20 09:48:52 +08:00
AttriTips.lua 【修行】增加属性提升提示 2021-06-01 13:54:21 +08:00
AttriTips.lua.meta 【修行】增加属性提升提示 2021-06-01 13:54:21 +08:00
CongratulationPopup.lua 【修行】恭喜破镜 2021-05-19 18:27:57 +08:00
CongratulationPopup.lua.meta 【修行】新增通用恭喜界面 2021-05-19 16:56:49 +08:00
GeneralBigPopup.lua Merge branch '0功能/玉虚论道' into 0功能/七界试炼 2021-09-22 11:46:24 +08:00
GeneralBigPopup.lua.meta 【易经宝库】提交 2020-11-05 19:10:20 +08:00
GeneralInfoPopup.lua 【七界试炼】遗物 2021-09-13 11:42:14 +08:00
GeneralInfoPopup.lua.meta 【修行】玩家信息界面怎加技能详情 2021-05-18 16:13:26 +08:00
GeneralRankRewardPanel.lua 【七界试炼】排行奖励 2021-09-08 14:36:37 +08:00
GeneralRankRewardPanel.lua.meta 通用奖励界面 设计大典->竞技场界面修改 2020-10-19 13:54:08 +08:00
GeneralTreasureMangaer.lua 【七界试炼】七界秘宝提交 2021-09-17 17:42:18 +08:00
GeneralTreasureMangaer.lua.meta 【七界试炼】提交 2021-09-13 18:06:39 +08:00
GeneralTreasurePanel.lua 【七界试炼】提交 2021-09-18 18:18:22 +08:00
GeneralTreasurePanel.lua.meta 【七界试炼】提交 2021-09-13 18:06:39 +08:00
View.meta 【易经宝库】主界面奖励显示 通用奖励界面创建 2020-11-04 19:51:58 +08:00
View2.meta 【修行】玩家信息界面怎加技能详情 2021-05-18 16:13:26 +08:00
View3.meta 【修行】新增通用恭喜界面 2021-05-19 16:56:49 +08:00