Merge pull request #67 from lilith-avatar/dev-v4

avakit v4合入
lilith-avatar · Aug 30, 2021 · c6ce30b · c6ce30b
2 parents a63c506 + bd75827
commit c6ce30b
Show file tree

Hide file tree

Showing 156 changed files with 7,069 additions and 3,941 deletions.
diff --git a/.ava-x2l-config.json b/.ava-x2l-config.json
diff --git a/.gitattributes b/.gitattributes
@@ -19,3 +19,10 @@
 *.tar filter=lfs diff=lfs merge=lfs -text
 *.vsdx filter=lfs diff=lfs merge=lfs -text
 *.exe filter=lfs diff=lfs merge=lfs -text
+*.smap filter=lfs diff=lfs merge=lfs -text
+*.mp3 filter=lfs diff=lfs merge=lfs -text
+*.mp4 filter=lfs diff=lfs merge=lfs -text
+*.mkv filter=lfs diff=lfs merge=lfs -text
+*.avi filter=lfs diff=lfs merge=lfs -text
+*.xmind filter=lfs diff=lfs merge=lfs -text
+*.aep filter=lfs diff=lfs merge=lfs -text
diff --git a/.gitignore b/.gitignore
@@ -1,18 +1,70 @@
-*AutoSave_*
-*AutoBackup_*
-xls/*.lua
-xls/*.csv
-csv/*.lua
-csv/*.xls
-csv/*.xlsm
-csv/*.xlsx
-code/*.csv
-code/*.xls
-code/*.xlsm
-code/*.xlsx
+# Compiled Lua sources
+luac.out
+
+# luarocks build files
+*.src.rock
+*.zip
+*.tar.gz
+
+# Object files
+*.o
+*.os
+*.ko
+*.obj
+*.elf
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+*.def
+*.exp
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# 策划文档
+Design/*.lua
+Design/*.smap
+
+# smap相关
+Smap/*.lua
+Smap/Code/*.csv
+Smap/Code/*.xls
+Smap/Code/*.xlsm
+Smap/Code/*.xlsx
+Smap/Code/*.txt
+*AutoSave_*.smap
+*AutoBackup_*.smap
+*.smap.config
+
+# 代码相关
+Code/*.txt
+Code/*.csv
+Code/*.xls
+Code/*.xlsm
+Code/*.xlsx
+Code/*.txt
+Code/*.smap
+
+# other
 *.smap.storage
 *.iso
 ~$*
 *.idea/
 *.vscode/
-Smap/avatar-ava-test.smap
diff --git a/Code/['World']['Client']['Init']['ClientAwakeScript'].AutorunScript.lua b/Code/['World']['Client']['Init']['ClientAwakeScript'].AutorunScript.lua
diff --git a/Code/['World']['Client']['Module']['LanguageUtilModule'].ModuleScript.lua b/Code/['World']['Client']['Module']['LanguageUtilModule'].ModuleScript.lua
diff --git a/Code/['World']['Global']['AutoAssignTeamScript'].Script.lua b/Code/['World']['Global']['AutoAssignTeamScript'].Script.lua
diff --git a/Code/['World']['Global']['Define']['ConfigModule'].ModuleScript.lua b/Code/['World']['Global']['Define']['ConfigModule'].ModuleScript.lua
diff --git a/Code/['World']['Global']['Define']['ConstModule'].ModuleScript.lua b/Code/['World']['Global']['Define']['ConstModule'].ModuleScript.lua
diff --git a/Code/['World']['Global']['Define']['DefaultModule'].ModuleScript.lua b/Code/['World']['Global']['Define']['DefaultModule'].ModuleScript.lua
diff --git a/Code/['World']['Global']['Define']['EventsModule'].ModuleScript.lua b/Code/['World']['Global']['Define']['EventsModule'].ModuleScript.lua
diff --git a/Code/['World']['Global']['Framework']['Client']['ClientBaseModule'].ModuleScript.lua b/Code/['World']['Global']['Framework']['Client']['ClientBaseModule'].ModuleScript.lua