• Li's avatar
    Merge remote-tracking branch 'origin/develop_msdh_1.0.0' into develop_msdh_1.0.0 · f607c70c
    Li authored
    # Conflicts:
    #	game/src/main/assets/bin/Data/Managed/Assembly-CSharp.dll
    #	game/src/main/assets/bin/Data/Managed/Unity.Analytics.DataPrivacy.dll
    #	game/src/main/assets/bin/Data/Managed/Unity.TextMeshPro.dll
    #	game/src/main/assets/bin/Data/globalgamemanagers
    #	game/src/main/assets/bin/Data/level1
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split0
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split1
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split10
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split11
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split12
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split13
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split14
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split15
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split16
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split17
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split18
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split19
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split2
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split21
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split22
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split23
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split24
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split25
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split26
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split27
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split28
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split29
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split3
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split30
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split31
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split32
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split33
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split34
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split35
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split36
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split37
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split38
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split39
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split4
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split5
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split6
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split8
    #	game/src/main/assets/bin/Data/sharedassets1.assets.split9
    f607c70c
Name
Last commit
Last update
..
libs Loading commit data...
src/main Loading commit data...
build.gradle Loading commit data...
gradle.properties Loading commit data...
local.properties Loading commit data...
proguard-unity.txt Loading commit data...