.gitignore

@@ -56,4 +56,6 @@
Assets/ResourcesOut*
Assets/Scripts*

UserSettings/*
UserSettings/*
/RunTimeLog
/*.vsconfig

 Assets/Editor/Web/NetPkgTool.cs

@@ -31,8 +31,6 @@
    bool reveralFilter;

    bool showHeartPackage;



    bool showMainServerPackage;

    bool showCrossServerPackage;

    int maxShowPackageCount;



    bool threading = true;

@@ -53,8 +51,6 @@


        LocalSave.SetBool("NetPackageSkinPattern", professionalSkin);

        LocalSave.SetInt("NetPackageShowMaxCount", maxShowPackageCount);

        LocalSave.SetBool("CrossServerPackage", showCrossServerPackage);

        LocalSave.SetBool("MainServerPackage", showMainServerPackage);

        LocalSave.SetString("NetPkgToolFilterNetPackageString", filterNetPkgStr);

        LocalSave.SetBool("NetPkgToolFilterNetPackageReveralFilter", reveralFilter);

    }

@@ -63,8 +59,6 @@
    {

        professionalSkin = LocalSave.GetBool("NetPackageSkinPattern", false);

        maxShowPackageCount = LocalSave.GetInt("NetPackageShowMaxCount", 100);

        showCrossServerPackage = LocalSave.GetBool("CrossServerPackage", true);

        showMainServerPackage = LocalSave.GetBool("MainServerPackage", true);

        filterNetPkgStr = LocalSave.GetString("NetPkgToolFilterNetPackageString");

        reveralFilter = LocalSave.GetBool("NetPkgToolFilterNetPackageReveralFilter", false);



@@ -76,18 +70,6 @@
    public void CheckPackageShowState(NetPackage package)

    {

        if (m_CurrentType != NetPackagetType.All && m_CurrentType != package.type)

        {

            package.show = false;

            return;

        }



        if (!showMainServerPackage && package.socketType == ServerType.Main)

        {

            package.show = false;

            return;

        }



        if (!showCrossServerPackage && package.socketType == ServerType.CrossSever)

        {

            package.show = false;

            return;

@@ -176,8 +158,6 @@
        GUILayout.BeginHorizontal();

        maxShowPackageCount = EditorGUILayout.IntField("最大显示封包数：", maxShowPackageCount);

        showHeartPackage = GUILayout.Toggle(showHeartPackage, "心跳包");

        showMainServerPackage = GUILayout.Toggle(showMainServerPackage, "主服");

        showCrossServerPackage = GUILayout.Toggle(showCrossServerPackage, "跨服");



        m_CurrentType = GUILayout.Toggle(m_CurrentType == NetPackagetType.All, "全部") ? NetPackagetType.All : m_CurrentType;

        m_CurrentType = GUILayout.Toggle(m_CurrentType == NetPackagetType.Server, "收包") ? NetPackagetType.Server : m_CurrentType;


 Assets/Launch/Config/AssetSource.cs

@@ -227,27 +227,6 @@
        }
    }

    static bool m_LuaFromEditor = false;
    public static bool luaFromEditor
    {
        get
        {
#if UNITY_EDITOR
            return LocalSave.GetBool("Asset_LuaFromEditor", true);
#else
            return false;
#endif
        }
        set
        {
#if UNITY_EDITOR
            LocalSave.SetBool("Asset_LuaFromEditor", value);
#else
            m_LuaFromEditor=value;
#endif
        }
    }


    static bool m_patchFromEditor = false;
    public static bool patchFromEditor

 Assets/Resources/VersionConfig.asset

@@ -31,6 +31,6 @@
  m_IsBanShu: 0
  m_BuildTime: 2025/05/22--1549
  m_BuildIndex: 6
  m_LogoPosition: {x: 0, y: 0}
  m_LogoPosition: {x: 0, y: 150}
  m_BanHao: 1
  m_SdkFileName: 

 Assets/Resources/VersionConfigEx.txt

@@ -1 +1 @@
{"m_AppId":"test","m_SpID":"test","m_VersionAuthority":0,"m_Version":"1.000.0","m_ClientPackageFlag":"2025","m_Branch":1,"m_AssetAccess":3,"m_PartAssetPackage":false,"m_ProductName":"testname","m_BundleIdentifier":"com.testapk.game","m_KeystoreFileName":"","m_KeystorePassword":"","m_KeystoreAlias":"","m_KeystoreAliasPassword":"","m_AppleDeveloperTeamID":"","m_DebugVersion":true,"m_IsBanShu":false,"m_BuildTime":"2025/05/22--1549","m_BuildIndex":6,"m_LogoPosition":{"x":0.0,"y":0.0},"m_BanHao":"1","m_SdkFileName":""}
{"m_AppId":"test","m_SpID":"test","m_VersionAuthority":0,"m_Version":"1.000.0","m_ClientPackageFlag":"2025","m_Branch":1,"m_AssetAccess":3,"m_PartAssetPackage":false,"m_ProductName":"testname","m_BundleIdentifier":"com.testapk.game","m_KeystoreFileName":"","m_KeystorePassword":"","m_KeystoreAlias":"","m_KeystoreAliasPassword":"","m_AppleDeveloperTeamID":"","m_DebugVersion":true,"m_IsBanShu":false,"m_BuildTime":"2025/05/22--1549","m_BuildIndex":6,"m_LogoPosition":{"x":0.0,"y":150.0},"m_BanHao":"1","m_SdkFileName":""}

 Hooks/commit-msg

@@ -1,9 +1,9 @@
#!/bin/sh

# -*- coding: UTF-8 -*- 



if [ "$(grep -in '^[0-9]\{4,5\} .*' "$1")" == "" ] && [ "$(grep -in '^Merge .*' "$1")" == "" ] && [ "$(grep -in '^Revert .*' "$1")" == "" ]; then

if [ "$(grep -in '^[0-9]\{1,5\} .*' "$1")" == "" ] && [ "$(grep -in '^Merge .*' "$1")" == "" ] && [ "$(grep -in '^Revert .*' "$1")" == "" ]; then

    echo 以下3种是正确的备注信息是：

    echo 1. 12345 正常提交备注信息必须以4到5位数字单号开头。#数字单号后面带空格#

    echo 1. 11 正常提交备注信息必须以1到5位数字单号开头。#数字单号后面带空格#

    echo 2. Merge 以Merge开头说明这是一次git合并操作，这是被允许的。#Merge后面带空格#

    echo 3. Revert 以Revert开头说明这是一次git还原操作，这是被允许的。#Revert后面带空格#

    exit 1