miduo_client/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2
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
..
GeneralInfoPopup_Cultivation.lua 【主角修为】问号文字调整 2021-10-21 11:14:24 +08:00
GeneralInfoPopup_Cultivation.lua.meta 【主角修为】问号提交 2021-10-20 18:35:30 +08:00
GeneralInfoPopup_ExploreMapTip.lua 探索提交 2021-12-24 00:14:32 +08:00
GeneralInfoPopup_ExploreMapTip.lua.meta 探索提交 2021-12-22 12:07:00 +08:00
GeneralInfoPopup_Gem.lua 【命格】提交 2021-12-10 11:40:15 +08:00
GeneralInfoPopup_Gem.lua.meta 【命格】加成预览提交 2021-12-08 17:27:22 +08:00
GeneralInfoPopup_Imprint.lua 【修行】this.spLoader提交 2021-05-20 09:48:52 +08:00
GeneralInfoPopup_Imprint.lua.meta 【修行】玩家信息界面怎加技能详情 2021-05-18 16:13:26 +08:00
GeneralInfoPopup_PracticeLevel.lua 【修行】提交 2021-05-19 16:14:09 +08:00
GeneralInfoPopup_PracticeLevel.lua.meta 【修行】提交 2021-05-19 16:14:09 +08:00
GeneralInfoPopup_QiJieAllTreasure.lua 【七界试炼】遗物 2021-09-13 11:42:14 +08:00
GeneralInfoPopup_QiJieAllTreasure.lua.meta 【七界试炼】遗物 2021-09-13 11:42:14 +08:00
GeneralInfoPopup_QiJieGoalAttri.lua 【七界试炼】增加怪物详情界面 2021-09-22 19:38:16 +08:00
GeneralInfoPopup_QiJieGoalAttri.lua.meta 【七界试炼】目标特性 2021-09-08 10:06:24 +08:00
GeneralInfoPopup_fourQuadrant.lua 【四象心法】技能加成bug修改 2021-09-17 15:18:50 +08:00
GeneralInfoPopup_fourQuadrant.lua.meta 【四象心法提交】 2021-09-09 20:45:12 +08:00