miduo_client/Assets/Scripts
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
..
AnimatorEvent 提交 2020-05-09 13:31:21 +08:00
Bloom 外网0.16.13 内网0.15.24 2020-06-30 18:59:44 +08:00
Bridge 【配置】服务器配置还原到version.txt中 2021-03-04 20:19:26 +08:00
Colorful FX 提交 2020-05-09 13:31:21 +08:00
Core 【语言功能】自动切换语言修改为可配置,修改游戏中设置语言按钮的位置 2021-03-19 14:19:05 +08:00
Debug 提交 2020-05-09 13:31:21 +08:00
Editor Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b 2021-04-02 11:34:27 +08:00
Effect 特效修改 2020-07-14 16:52:30 +08:00
Extension 提交 2020-05-09 13:31:21 +08:00
GameHelper 提交 2020-05-09 13:31:21 +08:00
GameInit 【语言功能】自动切换语言修改为可配置,修改游戏中设置语言按钮的位置 2021-03-19 14:19:05 +08:00
JsonUtility 提交 2020-05-09 13:31:21 +08:00
LuaProfiler 提交 2020-05-09 13:31:21 +08:00
UI 【优化】热更新界面显示优化 2020-12-30 17:24:43 +08:00
AnimatorEvent.meta 提交 2020-05-09 13:31:21 +08:00
Bloom.meta 外网0.16.13 内网0.15.24 2020-06-30 18:59:44 +08:00
Bridge.meta 提交 2020-05-09 13:31:21 +08:00
Colorful FX.meta 提交 2020-05-09 13:31:21 +08:00
Core.meta 提交 2020-05-09 13:31:21 +08:00
Debug.meta 提交 2020-05-09 13:31:21 +08:00
Editor.meta 提交 2020-05-09 13:31:21 +08:00
Effect.meta 提交 2020-05-09 13:31:21 +08:00
Extension.meta 提交 2020-05-09 13:31:21 +08:00
GameHelper.meta 提交 2020-05-09 13:31:21 +08:00
GameInit.meta 提交 2020-05-09 13:31:21 +08:00
JsonUtility.meta 提交 2020-05-09 13:31:21 +08:00
LuaProfiler.meta 提交 2020-05-09 13:31:21 +08:00
UI.meta 提交 2020-05-09 13:31:21 +08:00