miduo_client/Assets/ManagedResources/~Lua
gaoxin 1a4c96e88d Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Framework/Framework.lua
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/WeekCard.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
#	data_execl/Language_data/LanguageLua.csv
#	data_execl/Language_data/LanguageText.csv
2021-04-02 11:34:27 +08:00
..
.idea 提交 2020-05-09 13:31:21 +08:00
3rd 提交 2020-05-09 13:31:21 +08:00
BadWords 提交 2020-05-09 13:31:21 +08:00
Base 【音效】打开界面播放音效时不再播放点击音效 2020-11-01 14:45:09 +08:00
Common 【本地化】还原文本 2021-04-01 18:41:50 +08:00
Config 【逍遥游】功能合并到local分支 2020-10-19 20:37:53 +08:00
Data Merge branch '0活动开发聚集地/活动拆分归类' into china/dev 2021-03-30 20:41:32 +08:00
Extends 提交 2020-05-09 13:31:21 +08:00
Framework 【本地化】还原文本 2021-04-01 18:41:50 +08:00
Logic Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b 2021-04-02 11:34:27 +08:00
Message 【福星高照】增加协议 2021-03-30 18:50:15 +08:00
Modules Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b 2021-04-02 11:34:27 +08:00
System 提交 2020-05-09 13:31:21 +08:00
UITools 提交 2020-05-09 13:31:21 +08:00
UnityEngine 提交 2020-05-09 13:31:21 +08:00
View 【本地化】还原文本 2021-04-01 18:41:50 +08:00
cjson 提交 2020-05-09 13:31:21 +08:00
jit 提交 2020-05-09 13:31:21 +08:00
lpeg 提交 2020-05-09 13:31:21 +08:00
misc 【配置】兼容老包 2021-03-10 14:56:53 +08:00
protobuf 提交 2020-05-09 13:31:21 +08:00
socket 提交 2020-05-09 13:31:21 +08:00
3rd.meta 提交 2020-05-09 13:31:21 +08:00
BadWords.meta 提交 2020-05-09 13:31:21 +08:00
Base.meta 提交 2020-05-09 13:31:21 +08:00
Common.meta 提交 2020-05-09 13:31:21 +08:00
Config.meta 误删恢复 2020-07-04 15:34:30 +08:00
Data.meta 提交 2020-05-09 13:31:21 +08:00
Extends.meta 提交 2020-05-09 13:31:21 +08:00
Framework.meta 提交 2020-05-09 13:31:21 +08:00
Logic.meta 提交 2020-05-09 13:31:21 +08:00
Main.lua 提交 2020-05-09 13:31:21 +08:00
Main.lua.meta 提交 2020-05-09 13:31:21 +08:00
Message.meta 提交 2020-05-09 13:31:21 +08:00
Modules.meta 提交 2020-05-09 13:31:21 +08:00
PreLoad.lua 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
PreLoad.lua.meta 提交 2020-05-09 13:31:21 +08:00
System.meta 提交 2020-05-09 13:31:21 +08:00
UITools.meta 提交 2020-05-09 13:31:21 +08:00
UnityEngine.meta 提交 2020-05-09 13:31:21 +08:00
View.meta 提交 2020-05-09 13:31:21 +08:00
cjson.meta 提交 2020-05-09 13:31:21 +08:00
class.lua 提交 2020-05-09 13:31:21 +08:00
class.lua.meta 提交 2020-05-09 13:31:21 +08:00
event.lua 提交 2020-05-09 13:31:21 +08:00
event.lua.meta 提交 2020-05-09 13:31:21 +08:00
eventlib.lua 提交 2020-05-09 13:31:21 +08:00
eventlib.lua.meta 提交 2020-05-09 13:31:21 +08:00
events.lua 提交 2020-05-09 13:31:21 +08:00
events.lua.meta 提交 2020-05-09 13:31:21 +08:00
jit.meta 提交 2020-05-09 13:31:21 +08:00
list.lua 提交 2020-05-09 13:31:21 +08:00
list.lua.meta 提交 2020-05-09 13:31:21 +08:00
lpeg.meta 提交 2020-05-09 13:31:21 +08:00
ltn12.lua 提交 2020-05-09 13:31:21 +08:00
ltn12.lua.meta 提交 2020-05-09 13:31:21 +08:00
mime.lua 提交 2020-05-09 13:31:21 +08:00
mime.lua.meta 提交 2020-05-09 13:31:21 +08:00
misc.meta 提交 2020-05-09 13:31:21 +08:00
protobuf.meta 提交 2020-05-09 13:31:21 +08:00
slot.lua 提交 2020-05-09 13:31:21 +08:00
slot.lua.meta 提交 2020-05-09 13:31:21 +08:00
socket.lua 提交 2020-05-09 13:31:21 +08:00
socket.lua.meta 提交 2020-05-09 13:31:21 +08:00
socket.meta 提交 2020-05-09 13:31:21 +08:00
tolua.lua 提交 2020-05-09 13:31:21 +08:00
tolua.lua.meta 提交 2020-05-09 13:31:21 +08:00
typeof.lua 提交 2020-05-09 13:31:21 +08:00
typeof.lua.meta 提交 2020-05-09 13:31:21 +08:00