Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/snxxz_client

hch

2020-12-07 201d8f0f73de4c1dbb54b054f1c5cf3d4617c7af

Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/snxxz_client

 .gitignore

@@ -57,3 +57,4 @@
/Assets/VSCode
/Assets/Plugins/Android/The2thWorldSDK
/Assets/Plugins/Android/bin.meta
/Assets/Resources/VersionConfig.asset

 Assets/Editor/Keystore/gtgame.keystore

Binary files differ

 Assets/Editor/Keystore/gtgame.keystore.meta

New file
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: dfcce8c53160e2c48b13954c6903149d
DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Editor/VersionConfigs/Versions.txt

@@ -8,4 +8,4 @@
900    mgxbqy    mgxbqy    1    2.0.600    5001    2    xbqy    3    1    梦灵传说    com.mhtj.mg    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (0,80)        mggame    0    1
9998    xmyjgame    xmyjgame    1    1.100.2    aaa    4    xbqy    1    1    仙魔战场    com.xfzc.yj.quick    mengxiandao    mengxiandao2020    mengxiandao    mengxiandao2020        0    0    (-15,64)    出版单位名称:天津电子出版社有限公司 著作权人名称:广州秒乐网络科技有限公司</r>运营单位:广州游路网络科技有限公司 游戏内容类别:移动游戏 批文号:国新出审[2019]1132号 游戏版号:ISBN 978-7-498-06329-8    xmyjgame    0    
9527    TheSecondWorld    test    0    1.100.1    aaa    2    xbqy    3    1    仙宝奇缘    com.secondworld.snxxz    thesecondworld    thesecondworld2018    thesecondworld    thesecondworld2018        1    0     (-32,144)            0    
9528    gtgame    gtgame    1    1.100.1    aaa    1    xbqy    3    1    镇魔诀    com.sanxiagame.zmjgp    thesecondworld    thesecondworld2018    thesecondworld    thesecondworld2018        1    0    (0,80)        gtgame    0    1
9528    gtgame    gtgame    1    1.100.1    aaa    1    xbqy    3    1    镇魔诀    com.sanxiagame.zmjgp    gtgame    Fjsx123123    Key0    Fjsx123123        1    0    (0,80)        gtgame    0    1

 Assets/Editor/XCodeProjectMod.cs

@@ -253,14 +253,15 @@
        }

        s_IsAppend = true;

        BuildPipeline.BuildPlayer(ClientPackage.baseLevels, _buildPath, BuildTarget.iOS, BuildOptions.Il2CPP | BuildOptions.AcceptExternalModificationsToPlayer);
        PlayerSettings.SetScriptingBackend(BuildTargetGroup.iOS, ScriptingImplementation.IL2CPP);
        BuildPipeline.BuildPlayer(ClientPackage.baseLevels, _buildPath, BuildTarget.iOS, BuildOptions.AcceptExternalModificationsToPlayer);
    }

    public static void BuildIOSProject_Replace()
    {
        s_IsAppend = false;
        BuildPipeline.BuildPlayer(ClientPackage.baseLevels, GetBuildPath(), BuildTarget.iOS, BuildOptions.Il2CPP);
        PlayerSettings.SetScriptingBackend(BuildTargetGroup.iOS, ScriptingImplementation.IL2CPP);
        BuildPipeline.BuildPlayer(ClientPackage.baseLevels, GetBuildPath(), BuildTarget.iOS, BuildOptions.None);
    }

    [MenuItem("Build/ipa")]

 Assets/Resources/VersionConfig.asset

@@ -14,7 +14,7 @@
  m_EditorClassIdentifier: 
  m_AppId: test
  m_SpID: 
  m_VersionAuthority: 1
  m_VersionAuthority: 0
  m_Version: 1.0.0
  m_ClientPackageFlag: aaa
  m_Branch: 0