miduo_client/Assets/ManagedResources/~Lua
gaoxin 3e3d0d9416 Merge remote-tracking branch 'origin/china/xq' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-09-09 11:22:47 +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 【http】请求加密 2021-07-13 18:24:33 +08:00
Common Merge remote-tracking branch 'origin/china/xq' into china/dev 2021-09-09 11:22:47 +08:00
Config 【逍遥游】功能合并到local分支 2020-10-19 20:37:53 +08:00
Data Merge branch 'china/dev' into 0功能/silingshilian 2021-08-26 17:42:25 +08:00
Extends 提交 2020-05-09 13:31:21 +08:00
Framework 【防沉迷】游戏内添加未成年人判断 2021-09-06 11:00:34 +08:00
Logic Merge branch 'china/dev' into 0功能/silingshilian 2021-08-25 15:25:54 +08:00
Message 四灵第二次修改 2021-09-01 10:43:57 +08:00
Modules Merge remote-tracking branch 'origin/china/xq' into china/dev 2021-09-09 11:22:47 +08:00
System www下载错误卡死修改 2021-09-09 10:43:08 +08:00
UITools 提交 2020-05-09 13:31:21 +08:00
UnityEngine 提交 2020-05-09 13:31:21 +08:00
View Merge remote-tracking branch 'origin/china/xq' into china/dev 2021-09-09 11:22:47 +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 【添加stream配置】 2021-06-16 17:29:17 +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 【log】这个log会导致IOS切换账号卡死...什么鬼 2021-08-11 10:53:44 +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 【SpriteLoader】修改初始化位置,兼容老包 2021-05-28 14:34:01 +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