Przeglądaj źródła

1移除无用的bat脚本那些。 2干掉那些图鉴的立绘显示方案

hexiaojie 1 miesiąc temu
rodzic
commit
fd2fa0e2bf
30 zmienionych plików z 208 dodań i 909 usunięć
  1. 0 27
      BuildPush/webgl/config.json
  2. 0 93
      BuildPush/webgl/css/style.css
  3. 0 40
      BuildPush/webgl/index.html
  4. 0 424
      BuildPush/webgl/js/script.js
  5. 0 82
      BuildPush/全量上传.bat
  6. 0 7
      BuildPush/发布注意.txt
  7. 0 92
      BuildPush/增量智能法上传.bat
  8. 102 33
      GameClient/.idea/.idea.GameClient/.idea/workspace.xml
  9. 0 5
      GameClient/Assets/AssetBundleCollectorSetting.asset
  10. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.fadeMotionList.asset
  11. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_01.anim
  12. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_02.anim
  13. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_03.anim
  14. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_04.anim
  15. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/sample_01.anim
  16. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_01.anim
  17. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_02.anim
  18. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_03.anim
  19. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.fadeMotionList.asset
  20. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_00.anim
  21. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_01.anim
  22. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_02.anim
  23. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_03.anim
  24. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_04.anim
  25. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_05.anim
  26. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_06.anim
  27. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_07.anim
  28. 1 1
      GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_08.anim
  29. 1 1
      GameClient/ProjectSettings/ProjectSettings.asset
  30. 86 86
      GameClient/UserSettings/Layouts/default-2022.dwlt

+ 0 - 27
BuildPush/webgl/config.json

@@ -1,27 +0,0 @@
-{
-  "compressionType": "Gzip",
-  "buildPath": "https://cdn.goufuguiwxw.com/ResWebGlTest/gfg/Build/",
-  "compressionConfigs": {
-    "Disabled": {
-      "dataFile": "webgl.data",
-      "frameworkFile": "webgl.framework.js",
-      "wasmFile": "webgl.wasm",
-      "loaderFile": "webgl.loader.js",
-      "jpgFile": "webgl.jpg"
-    },
-    "Brotil": {
-      "dataFile": "webgl.data.br",
-      "frameworkFile": "webgl.framework.js.br",
-      "wasmFile": "webgl.wasm.br",
-      "loaderFile": "webgl.loader.js",
-      "jpgFile": "webgl.jpg"
-    },
-    "Gzip": {
-      "dataFile": "webgl.data.gz",
-      "frameworkFile": "webgl.framework.js.gz",
-      "wasmFile": "webgl.wasm.gz",
-      "loaderFile": "webgl.loader.js",
-      "jpgFile": "webgl.jpg"
-    }
-  }
-}

+ 0 - 93
BuildPush/webgl/css/style.css

@@ -1,93 +0,0 @@
-/* 视口规则建议放在CSS最前面 */
-@viewport {
-  width: device-width;
-  zoom: 1.0;
-}
-
-body,
-html {
-  margin: 0;
-  padding: 0;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  background: #000;
-  touch-action: none;
-}
-
-#unity-container {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background: #000;
-  /* 确保初始状态就居中 */
-  left: 0;
-  right: 0;
-  margin: 0 auto;
-  /* 添加过渡效果避免闪动 */
-  transition: opacity 0.3s ease;
-  opacity: 0;
-  /* 初始不可见 */
-}
-
-/* 基础竖屏尺寸(9:16比例) */
-#unity-canvas {
-  width: 360px;
-  /* 基准宽度 */
-  height: 640px;
-  /* 基准高度 */
-  background: url('https://cdn.goufuguiwxw.com/ResWebGlTest/gfg/Build/webgl.jpg') center / cover;
-  /* 确保canvas初始位置正确 */
-  position: relative;
-  left: 0;
-  margin: 0 auto;
-}
-
-/* 高质量渲染 */
-#unity-canvas {
-  image-rendering: -webkit-optimize-contrast;
-  image-rendering: crisp-edges;
-  -webkit-font-smoothing: subpixel-antialiased;
-}
-
-/* 移动端适配 */
-@media (max-width: 768px) {
-  #unity-canvas {
-    width: 100vw !important;
-    /* 精确匹配视口宽度 */
-    height: calc(100vw * 16/9) !important;
-    /* 强制按比例计算高度 */
-    max-height: 100vh !important;
-    /* 确保不超过屏幕高度 */
-    position: absolute;
-    left: 0 !important;
-    right: 0 !important;
-  }
-
-  #unity-container {
-    width: 100vw !important;
-    /* 使用视口单位确保精确 */
-    overflow: hidden;
-    /* 隐藏任何可能的溢出 */
-  }
-
-  /* 修复iOS Safari的视口问题 */
-  @supports (-webkit-touch-callout: none) {
-    #unity-canvas {
-      height: -webkit-fill-available !important;
-    }
-  }
-}
-
-/* PC端特殊适配 */
-@media (min-width: 769px) {
-  #unity-canvas {
-    height: 100vh !important;
-    /* 独占高度 */
-    width: calc(100vh * 9/16) !important;
-    /* 按比例计算宽度 */
-  }
-}

+ 0 - 40
BuildPush/webgl/index.html

@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-us">
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <title>Unity WebGL Player | 万世镜</title>
-  <!-- <link rel="shortcut icon" href="TemplateData/favicon.ico">
-  <link rel="stylesheet" href="TemplateData/style.css"> -->
-  <link rel="stylesheet" href="https://cdn.goufuguiwxw.com/ResWebGlTest/gfg/css/style.css">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <meta name="screen-orientation" content="portrait">
-  <script src="https://cdn.jihuigame.com/sdk/h5sdk-1.0.2.js" onerror="console.error('SDK加载失败!')">
-  </script>
-</head>
-
-<body>
-  <div id="unity-container" class="unity-desktop">
-    <canvas id="unity-canvas" width=960 height=600></canvas>
-    <div id="unity-loading-bar">
-      <div id="unity-logo"></div>
-      <div id="unity-progress-bar-empty">
-        <div id="unity-progress-bar-full"></div>
-      </div>
-    </div>
-    <div id="unity-warning"> </div>
-    <div id="unity-footer">
-      <div id="unity-webgl-logo"></div>
-      <div id="unity-fullscreen-button"></div>
-      <div id="unity-build-title">万世镜</div>
-    </div>
-  </div>
-
-  <!-- 添加SDK交互的div -->
-  <div id="sdk-container" style="display:none;"></div>
-
-  <script src="https://cdn.goufuguiwxw.com/ResWebGlTest/gfg/js/script.js"></script>
-</body>
-
-</html>

+ 0 - 424
BuildPush/webgl/js/script.js

@@ -1,424 +0,0 @@
-// 全局缩放控制
-var currentScale = 1;
-var baseWidth = 360;  // 基准设计宽度
-var baseHeight = 640; // 基准设计高度
-var buildConfig = null;
-
-// 加载配置文件
-async function loadBuildConfig() {
-  try {
-    const response = await fetch('https://cdn.goufuguiwxw.com/ResWebGlTest/gfg/config.json');
-    buildConfig = await response.json();
-    console.log('配置文件加载成功:', buildConfig);
-    return buildConfig;
-  } catch (error) {
-    console.error('配置文件加载失败:', error);
-    // 使用默认配置
-    buildConfig = {
-      compressionType: "Brotil",
-      buildPath: "Build/",
-      compressionConfigs: {
-        "Brotil": {
-          dataFile: "webgl.data.br",
-          frameworkFile: "webgl.framework.js.br",
-          wasmFile: "webgl.wasm.br",
-          loaderFile: "webgl.loader.js",
-          jpgFile: "webgl.jpg"
-        }
-      }
-    };
-    return buildConfig;
-  }
-}
-
-// 获取文件URL
-function getBuildFileUrl(filename) {
-  if (!buildConfig) {
-    return `Build/${filename}`;
-  }
-  return `${buildConfig.buildPath}${filename}`;
-}
-
-// 获取当前压缩配置
-function getCurrentCompressionConfig() {
-  if (!buildConfig) {
-    return {
-      dataFile: "webgl.data.br",
-      frameworkFile: "webgl.framework.js.br",
-      wasmFile: "webgl.wasm.br",
-      loaderFile: "webgl.loader.js",
-      jpgFile: "webgl.jpg"
-    };
-  }
-
-  const compressionType = buildConfig.compressionType;
-  return buildConfig.compressionConfigs[compressionType] ||
-    buildConfig.compressionConfigs["Brotil"];
-}
-
-
-window.onload = async function () {
-  // 先加载配置文件
-  await loadBuildConfig();
-
-  var container = document.getElementById("unity-container");
-  var canvas = document.getElementById("unity-canvas");
-
-  function updateCanvasSize() {
-    var windowWidth = window.innerWidth;
-    var windowHeight = window.innerHeight;
-    var gameRatio = baseWidth / baseHeight;
-    // 立即显示容器(避免闪动)
-    container.style.opacity = '1';
-
-    // 初始强制居中
-    container.style.left = '0';
-    container.style.right = '0';
-    canvas.style.left = '0';
-    canvas.style.margin = '0 auto';
-
-    // PC端特殊处理(高度优先)
-    if (windowWidth > 768) {
-      // 按高度计算显示宽度
-      var displayWidth = windowHeight * gameRatio;
-      currentScale = windowHeight / baseHeight;
-
-      // 更新Canvas物理尺寸(解决模糊)
-      canvas.style.width = displayWidth + 'px';
-      canvas.style.height = windowHeight + 'px';
-      canvas.width = displayWidth * window.devicePixelRatio;
-      canvas.height = windowHeight * window.devicePixelRatio;
-    }
-    // 移动端处理
-    else {
-      // 保持原比例缩放
-      var scale = Math.min(
-        windowWidth / baseWidth,
-        windowHeight / baseHeight
-      );
-      currentScale = scale;
-
-      // 更新Canvas物理尺寸
-      var displayWidth = baseWidth * scale;
-      var displayHeight = baseHeight * scale;
-      canvas.style.width = displayWidth + 'px';
-      canvas.style.height = displayHeight + 'px';
-      canvas.width = displayWidth * window.devicePixelRatio;
-      canvas.height = displayHeight * window.devicePixelRatio;
-    }
-
-    // 强制重绘(解决某些浏览器渲染问题)
-    if (window.unityInstance) {
-      window.unityInstance.Module.requestAnimationFrame(() => { });
-    }
-  }
-
-  // 初始化调整
-  updateCanvasSize();
-  window.addEventListener('resize', updateCanvasSize);
-  window.addEventListener('fullscreenchange', updateCanvasSize);
-};
-
-// 修复鼠标/触摸事件坐标
-function fixEventCoordinates(event) {
-  if (!window.unityInstance) return;
-
-  var rect = canvas.getBoundingClientRect();
-  var scaleX = canvas.width / rect.width;
-  var scaleY = canvas.height / rect.height;
-
-  // 修正坐标
-  if (event.clientX !== undefined) {
-    event.unityX = (event.clientX - rect.left) * scaleX;
-    event.unityY = (event.clientY - rect.top) * scaleY;
-  }
-}
-
-// 从URL获取SDK参数
-function getSDKParamsFromUrl() {
-  var urlParams = new URLSearchParams(window.location.search);
-  return {
-    user_id: urlParams.get('user_id'),
-    user_name: urlParams.get('user_name'),
-    uuid: urlParams.get('uuid'),
-    sign: urlParams.get('sign'),
-    timestamp: urlParams.get('timestamp'),
-    cp_ext: urlParams.get('cp_ext')
-  };
-}
-
-// 初始化SDK参数
-function initSDKParams() {
-  sdkParams = getSDKParamsFromUrl();
-  console.log("SDK Params:", sdkParams);
-}
-
-// 显示临时消息横幅
-function unityShowBanner(msg, type) {
-  function updateBannerVisibility() {
-    warningBanner.style.display = warningBanner.children.length ? 'block' : 'none';
-  }
-  var div = document.createElement('div');
-  div.innerHTML = msg;
-  warningBanner.appendChild(div);
-  if (type == 'error') div.style = 'background: red; padding: 10px;';
-  else {
-    if (type == 'warning') div.style = 'background: yellow; padding: 10px;';
-    setTimeout(function () {
-      warningBanner.removeChild(div);
-      updateBannerVisibility();
-    }, 5000);
-  }
-  updateBannerVisibility();
-}
-
-// 初始化Unity应用
-async function initUnity() {
-  // 确保配置文件已加载
-  if (!buildConfig) {
-    await loadBuildConfig();
-  }
-
-  var container = document.querySelector("#unity-container");
-  var canvas = document.querySelector("#unity-canvas");
-  var loadingBar = document.querySelector("#unity-loading-bar");
-  var progressBarFull = document.querySelector("#unity-progress-bar-full");
-  var fullscreenButton = document.querySelector("#unity-fullscreen-button");
-  var warningBanner = document.querySelector("#unity-warning");
-
-  // 获取当前压缩配置
-  const compressionConfig = getCurrentCompressionConfig();
-
-  // 构建文件URL
-  const loaderUrl = getBuildFileUrl(compressionConfig.loaderFile);
-  const dataUrl = getBuildFileUrl(compressionConfig.dataFile);
-  const frameworkUrl = getBuildFileUrl(compressionConfig.frameworkFile);
-  const codeUrl = getBuildFileUrl(compressionConfig.wasmFile);
-  const jpgUrl = getBuildFileUrl(compressionConfig.jpgFile);
-
-  console.log('使用压缩格式:', buildConfig.compressionType);
-  console.log('文件配置:', {
-    loaderUrl, dataUrl, frameworkUrl, codeUrl, jpgUrl
-  });
-
-  // 监听所有输入事件
-  ['mousedown', 'mouseup', 'mousemove', 'touchstart', 'touchend', 'touchmove'].forEach(function (eventName) {
-    canvas.addEventListener(eventName, fixEventCoordinates, { passive: false });
-  });
-
-  var config = {
-    dataUrl: dataUrl,
-    frameworkUrl: frameworkUrl,
-    codeUrl: codeUrl,
-    streamingAssetsUrl: "StreamingAssets",
-    companyName: "gfg",
-    productName: "万世镜",
-    productVersion: "1.0",
-    showBanner: unityShowBanner,
-    devicePixelRatio: window.devicePixelRatio || 1,
-    preserveDrawingBuffer: true
-  };
-
-  if (/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)) {
-    canvas.style.width = '100vw';
-    canvas.style.height = 'calc(100vw * 16/9)';
-
-    setTimeout(() => {
-      canvas.style.width = '100%';
-      canvas.style.height = '100%';
-    }, 100);
-  } else {
-    config.devicePixelRatio = 1;
-  }
-
-  canvas.style.background = "url('" + jpgUrl + "') center / cover";
-  loadingBar.style.display = "block";
-
-  var script = document.createElement("script");
-  script.src = loaderUrl;
-  script.onload = () => {
-    createUnityInstance(canvas, config, (progress) => {
-      progressBarFull.style.width = 100 * progress + "%";
-    }).then((unityInstance) => {
-      loadingBar.style.display = "none";
-      window.unityInstance = unityInstance;
-      fullscreenButton.onclick = () => {
-        unityInstance.SetFullscreen(1).then(() => {
-          setTimeout(() => {
-            canvas.width = canvas.clientWidth * window.devicePixelRatio;
-            canvas.height = canvas.clientHeight * window.devicePixelRatio;
-            if (unityInstance.SendMessage) {
-              unityInstance.SendMessage('JSBridge', 'OnFullscreenChanged', '1');
-            }
-            if (/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)) {
-              document.getElementById("unity-canvas").style.marginLeft = '0';
-            }
-          }, 300);
-        });
-      };
-
-      initSDKParams();
-      window.unityInstance = unityInstance;
-      setupSDKCallbacks(unityInstance);
-
-    }).catch((message) => {
-      alert('Unity加载失败: ' + message);
-    });
-  };
-  document.body.appendChild(script);
-}
-
-// SDK交互功能
-function onSDKLoaded() {
-  setupSDKCallbacks(window.unityInstance);
-}
-
-// 这部分代码将在Unity加载完成后执行
-function setupSDKCallbacks(unityInstance) {
-  // 支付回调示例
-  window.JHRecharge = function (params) {
-    console.log("调用支付:", params);
-
-    const sdkParams = {
-      amount: Number(params.amount), // 确保是 Number 类型
-      cpProductId: params.cpProductId,       // cpProductId → cp_product_id
-      productName: params.productName,        // productName → product_name
-      notifyUrl: "https://webgltest.goufuguiwxw.com/gfg/recharge/jhganmeh5",            // notifyUrl → notify_url
-      serverId: params.serverId,              // serverId → server_id
-      serverName: params.serverName,          // serverName → server_name
-      roleName: params.roleName,              // roleName → role_name
-      roleId: params.roleId,                  // roleId → role_id
-      roleLevel: params.roleLevel,            // roleLevel → role_level
-      vipLevel: params.vipLevel,              // vipLevel → vip_level
-      cpOrderId: params.cpOrderId,           // cpOrderId → cp_order_id(关键字段)
-      balance: params.balance,                 // 确保是 String 类型(文档要求)
-      extra: params.extra,
-      fighting: params.fighting
-    };
-
-    // 这里可以添加支付前的Unity交互逻辑
-    // 例如通知Unity准备支付
-    if (unityInstance) {
-      unityInstance.SendMessage('JHGameSDKGameObject', 'OnRechargeStart', JSON.stringify(params));
-    }
-
-    // 调用SDK支付
-    JHGameSDK.recharge(sdkParams).then(function (res) {
-      console.log('支付结果:', res);
-      // 支付完成后通知Unity
-      if (unityInstance) {
-        unityInstance.SendMessage('JHGameSDKGameObject', 'OnRechargeComplete', JSON.stringify(res));
-      }
-    }).catch(function (error) {
-      console.error('支付错误:', error);
-      if (unityInstance) {
-        unityInstance.SendMessage('JHGameSDKGameObject', 'OnRechargeError', JSON.stringify(error));
-      }
-    });
-  };
-
-  // 创建角色回调
-  window.JHCreateRole = function (params) {
-    console.log("创建角色:", params);
-    if (unityInstance) {
-      unityInstance.SendMessage('JHGameSDKGameObject', 'OnCreateRoleStart', JSON.stringify(params));
-    }
-
-    JHGameSDK.createRole(params).then(function (res) {
-      console.log('创建角色结果:', res);
-      if (unityInstance) {
-        unityInstance.SendMessage('JHGameSDKGameObject', 'OnCreateRoleComplete', JSON.stringify(res));
-      }
-    }).catch(function (error) {
-      console.error('创建角色错误:', error);
-      if (unityInstance) {
-        unityInstance.SendMessage('JHGameSDKGameObject', 'OnCreateRoleError', JSON.stringify(error));
-      }
-    });
-  };
-
-  // 角色登录回调
-  window.JHLoginRole = function (params) {
-    console.log("角色登录:", params);
-    if (unityInstance) {
-      unityInstance.SendMessage('JHGameSDKGameObject', 'OnLoginRoleStart', JSON.stringify(params));
-    }
-
-    JHGameSDK.loginRole(params).then(function (res) {
-      console.log('角色登录结果:', res);
-      if (unityInstance) {
-        unityInstance.SendMessage('JHGameSDKGameObject', 'OnLoginRoleComplete', JSON.stringify(res));
-      }
-    }).catch(function (error) {
-      console.error('角色登录错误:', error);
-      if (unityInstance) {
-        unityInstance.SendMessage('JHGameSDKGameObject', 'OnLoginRoleError', JSON.stringify(error));
-      }
-    });
-  };
-
-  // 角色升级回调
-  window.JHUpgradeRole = function (params) {
-    console.log("角色升级:", params);
-    if (unityInstance) {
-      unityInstance.SendMessage('JHGameSDKGameObject', 'OnUpgradeRoleStart', JSON.stringify(params));
-    }
-
-    JHGameSDK.upgradeRole(params).then(function (res) {
-      console.log('角色升级结果:', res);
-      if (unityInstance) {
-        unityInstance.SendMessage('JHGameSDKGameObject', 'OnUpgradeRoleComplete', JSON.stringify(res));
-      }
-    }).catch(function (error) {
-      console.error('角色升级错误:', error);
-      if (unityInstance) {
-        unityInstance.SendMessage('JHGameSDKGameObject', 'OnUpgradeRoleError', JSON.stringify(error));
-      }
-    });
-  };
-
-  // 顶号回调
-  window.JHRepeatLogin = function () {
-    console.log("顶号处理");
-    if (unityInstance) {
-      unityInstance.SendMessage('JHGameSDKGameObject', 'OnRepeatLoginStart', '');
-    }
-
-    JHGameSDK.repeatLogin().then(function (res) {
-      console.log('顶号结果:', res);
-      if (unityInstance) {
-        unityInstance.SendMessage('JHGameSDKGameObject', 'OnRepeatLoginComplete', JSON.stringify(res));
-      }
-    }).catch(function (error) {
-      console.error('顶号错误:', error);
-      if (unityInstance) {
-        unityInstance.SendMessage('JHGameSDKGameObject', 'OnRepeatLoginError', JSON.stringify(error));
-      }
-    });
-  };
-
-  // 备案跳转回调
-  window.JHCallIcpBeian = function () {
-    console.log("备案跳转");
-    if (unityInstance) {
-      unityInstance.SendMessage('JHGameSDKGameObject', 'OnCallIcpBeianStart', '');
-    }
-
-    JHGameSDK.call({ target: "icpbeian" }).then((res) => {
-      console.log('备案跳转结果:', res);
-      if (unityInstance) {
-        unityInstance.SendMessage('JHGameSDKGameObject', 'OnCallIcpBeianComplete', JSON.stringify(res));
-      }
-    }).catch(function (error) {
-      console.error('备案跳转错误:', error);
-      if (unityInstance) {
-        unityInstance.SendMessage('JHGameSDKGameObject', 'OnCallIcpBeianError', JSON.stringify(error));
-      }
-    });
-  };
-}
-
-// 初始化应用
-document.addEventListener('DOMContentLoaded', function () {
-  initUnity();
-});

+ 0 - 82
BuildPush/全量上传.bat

@@ -1,82 +0,0 @@
-@echo off
-chcp 65001
-title WebGL上传调试
-
-set "OBSUTIL=C:\RuanJian\obsutil_windows_amd64\obsutil.exe"
-
-echo ===== 调试信息 =====
-echo 当前目录: %CD%
-echo OBSUTIL: %OBSUTIL%
-echo.
-
-:: 第一个上传任务
-set "LOCAL_DIR1=C:\Code\Client\GameClient\Bundles\WebGL\GameLogic\HostPlay"
-set "OBS_DIR1=obs://gfg-client/ResWebGlTest/WebGL/GameLogic/HostPlay/"
-
-echo ===== 任务1: 上传GameLogic/HostPlay =====
-echo 本地目录: %LOCAL_DIR1%
-echo OBS目录: %OBS_DIR1%
-echo.
-
-echo 执行命令...
-%OBSUTIL% cp "%LOCAL_DIR1%" "%OBS_DIR1%" -r -f -flat -u -vmd5
-
-if %errorlevel% equ 0 (
-    echo [成功] 任务1上传完成!
-) else (
-    echo [错误] 任务1上传失败,错误代码: %errorlevel%
-    goto :error
-)
-
-echo.
-
-:: 第二个上传任务
-set "LOCAL_DIR2=C:\Code\Client\GameClient\build\webgl"
-set "OBS_DIR2=obs://gfg-client/ResWebGlTest/gfg/"
-
-echo ===== 任务2: 上传WebGL构建文件 =====
-echo 本地目录: %LOCAL_DIR2%
-echo OBS目录: %OBS_DIR2%
-echo.
-
-echo 执行命令...
-%OBSUTIL% cp "%LOCAL_DIR2%" "%OBS_DIR2%" -r -f -flat -u -vmd5
-
-if %errorlevel% equ 0 (
-    echo [成功] 任务2上传完成!
-) else (
-    echo [错误] 任务2上传失败,错误代码: %errorlevel%
-    goto :error
-)
-
-echo.
-
-:: 第三个上传任务
-set "LOCAL_DIR3=C:\Code\Client\BuildPush\webgl"
-set "OBS_DIR3=obs://gfg-client/ResWebGlTest/gfg/"
-
-echo ===== 任务3: 上传BuildPush/webgl =====
-echo 本地目录: %LOCAL_DIR3%
-echo OBS目录: %OBS_DIR3%
-echo.
-
-echo 执行命令...
-%OBSUTIL% cp "%LOCAL_DIR3%" "%OBS_DIR3%" -r -f -flat -u -vmd5
-
-if %errorlevel% equ 0 (
-    echo [成功] 任务3上传完成!
-) else (
-    echo [错误] 任务3上传失败,错误代码: %errorlevel%
-    goto :error
-)
-
-echo.
-echo ===== 所有任务完成 =====
-goto :end
-
-:error
-echo.
-echo ===== 上传过程中出现错误 =====
-
-:end
-pause

+ 0 - 7
BuildPush/发布注意.txt

@@ -1,7 +0,0 @@
-发布注意
-1.先进行yooAsset build
-2.build unity webgl, 发布的时候要发布到路径为GameClient\build\webgl, 按照我的一贯操作是直接删了GameClient\build\webgl这个文件夹, 然后重新创建一个GameClient\build\webgl, 把发布的文件打到GameClient\build\webgl
-3.到项目根目录的BuildPush,执行"全量上传.bat"或者执行"增量智能法上传.bat"把文件啥的推送到OBS上.
-4.打包使用的是"Disabled"还是"Brotil" 还是"Gzip", 假设用的Gzip, 那么要到BuildPush\webgl路径下去更改config.json里面的compressionType为"Gzip"
-
-PS:如果要更改webgl入口文件的js, 跟css可以到BuildPush\webgl下面去改然后自行执行bat脚本进行发布, 更改index.html要找晓捷进行发布.

+ 0 - 92
BuildPush/增量智能法上传.bat

@@ -1,92 +0,0 @@
-@echo off
-chcp 65001
-title WebGL-智能上传组合
-
-set "OBSUTIL=C:\RuanJian\obsutil_windows_amd64\obsutil.exe"
-
-echo ===== 智能上传策略 =====
-echo 任务1: 只上传2天内修改的文件 (智能模式)
-echo 任务2: 全量上传构建目录 (强制模式)
-echo 任务3: 全量上传BuildPush目录 (强制模式)
-echo 均使用MD5验证确保数据一致性
-echo.
-
-:: ========================
-:: 任务1:智能上传HostPlay
-:: ========================
-set "LOCAL_DIR1=C:\Code\Client\GameClient\Bundles\WebGL\GameLogic\HostPlay"
-set "OBS_DIR1=obs://gfg-client/ResWebGlTest/WebGL/GameLogic/HostPlay/"
-
-echo [任务1] 准备上传: %LOCAL_DIR1%
-echo       目标位置: %OBS_DIR1%
-
-:: 设置时间范围(2天内)
-powershell -command "$date = Get-Date; $startDate = $date.AddDays(-2).ToString('yyyyMMdd000000'); $endDate = $date.ToString('yyyyMMdd235959'); echo $startDate-$endDate" > "%temp%\time_range.txt"
-set /p TIMERANGE=<"%temp%\time_range.txt"
-
-echo 时间范围: %TIMERANGE%
-echo.
-
-echo 正在执行智能上传...
-"%OBSUTIL%" cp "%LOCAL_DIR1%" "%OBS_DIR1%" -r -f -flat -u -vmd5 -timeRange=%TIMERANGE%
-
-if %errorlevel% neq 0 (
-    echo [错误] 任务1上传失败,错误代码: %errorlevel%
-    goto :error
-)
-echo [成功] 任务1完成!
-echo.
-
-:: ========================
-:: 任务2:全量上传webgl构建
-:: ========================
-set "LOCAL_DIR2=C:\Code\Client\GameClient\build\webgl"
-set "OBS_DIR2=obs://gfg-client/ResWebGlTest/gfg/"
-
-echo [任务2] 准备全量上传: %LOCAL_DIR2%
-echo       目标位置: %OBS_DIR2%
-echo.
-
-echo 正在执行全量上传...
-"%OBSUTIL%" cp "%LOCAL_DIR2%" "%OBS_DIR2%" -r -f -flat -u -vmd5
-
-if %errorlevel% neq 0 (
-    echo [错误] 任务2上传失败,错误代码: %errorlevel%
-    goto :error
-)
-echo [成功] 任务2完成!
-echo.
-
-:: ========================
-:: 任务3:全量上传BuildPush/webgl
-:: ========================
-set "LOCAL_DIR3=C:\Code\Client\BuildPush\webgl"
-set "OBS_DIR3=obs://gfg-client/ResWebGlTest/gfg/"
-
-echo [任务3] 准备全量上传: %LOCAL_DIR3%
-echo       目标位置: %OBS_DIR3%
-echo.
-
-echo 正在执行全量上传...
-"%OBSUTIL%" cp "%LOCAL_DIR3%" "%OBS_DIR3%" -r -f -flat -u -vmd5
-
-if %errorlevel% neq 0 (
-    echo [错误] 任务3上传失败,错误代码: %errorlevel%
-    goto :error
-)
-echo [成功] 任务3完成!
-echo.
-
-:: ========================
-:: 完成处理
-:: ========================
-echo ===== 所有任务执行完毕 =====
-goto :end
-
-:error
-echo.
-echo ===== 上传过程中出现错误 =====
-echo 建议检查网络连接或目录权限
-
-:end
-pause

+ 102 - 33
GameClient/.idea/.idea.GameClient/.idea/workspace.xml

@@ -6,7 +6,85 @@
   <component name="ChangeListManager">
     <list default="true" id="19bfabb9-fe2e-4e01-a01b-df7ac5ab759f" name="更改" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/GameClient.sln.DotSettings.user" beforeDir="false" afterPath="$PROJECT_DIR$/GameClient.sln.DotSettings.user" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/DOTweenSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/DOTweenSettings.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Clipping/Clipping.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Clipping/Clipping.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Clipping/Clipping.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Clipping/Clipping.prefab" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Koharu/Koharu.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Koharu/Koharu.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Koharu/Koharu.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Koharu/Koharu.prefab" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.expressionList.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.expressionList.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.fadeMotionList.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.fadeMotionList.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.prefab" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_01.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_01.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_02.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_02.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_03.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_03.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_04.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_04.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_05.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_05.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_06.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_06.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_07.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_07.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_08.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_08.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_01.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_01.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_01.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_01.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_02.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_02.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_02.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_02.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_03.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_03.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_03.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_03.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_04.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_04.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_04.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_04.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/sample_01.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/sample_01.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/sample_01.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/sample_01.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_01.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_01.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_01.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_01.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_02.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_02.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_02.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_02.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_03.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_03.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_03.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_03.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.expressionList.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.expressionList.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.fadeMotionList.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.fadeMotionList.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.prefab" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_00.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_00.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_01.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_01.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_02.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_02.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_03.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_03.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_04.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_04.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_05.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_05.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_06.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_06.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_07.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_07.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_08.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_08.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_09.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_09.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_10.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_10.exp3.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_00.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_00.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_00.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_00.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_01.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_01.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_01.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_01.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_02.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_02.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_02.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_02.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_03.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_03.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_03.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_03.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_04.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_04.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_04.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_04.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_05.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_05.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_05.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_05.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_06.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_06.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_06.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_06.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_07.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_07.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_07.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_07.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_08.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_08.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_08.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_08.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/Rice.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/Rice.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/Rice.fadeMotionList.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/Rice.fadeMotionList.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/Rice.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/Rice.prefab" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_00.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_00.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_00.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_00.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_01.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_01.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_01.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_01.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_02.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_02.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_02.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_02.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_03.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_03.anim" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_03.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_03.fade.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UserSettings/Layouts/default-2022.dwlt" beforeDir="false" afterPath="$PROJECT_DIR$/UserSettings/Layouts/default-2022.dwlt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -36,46 +114,43 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;XThreadsFramesViewSplitterKey&quot;: &quot;0.5252396&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;H5sdk&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;,
-    &quot;附加到 Unity 编辑器.附加到 Unity 编辑器.executor&quot;: &quot;Debug&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "XThreadsFramesViewSplitterKey": "0.5252396",
+    "git-widget-placeholder": "master",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "vue.rearranger.settings.migration": "true",
+    "附加到 Unity 编辑器.附加到 Unity 编辑器.executor": "Debug"
   }
-}</component>
+}]]></component>
   <component name="RunManager" selected="附加到 Unity 编辑器.附加到 Unity 编辑器">
     <configuration name="启动 Unity" type="RunUnityExe" factoryName="Unity Executable">
-      <option name="EXE_PATH" value="E:\ruanJian\2022.3.0f1c1\Editor\Unity.exe" />
+      <option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2022.3.0f1c1\Editor\Unity.exe" />
       <option name="PROGRAM_PARAMETERS" value="-projectPath D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient -debugCodeOptimization" />
       <option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient" />
       <option name="PASS_PARENT_ENVS" value="1" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
       <option name="ENV_FILE_PATHS" value="" />
       <option name="REDIRECT_INPUT_PATH" value="" />
-      <option name="PTY_MODE" value="Auto" />
       <option name="MIXED_MODE_DEBUG" value="0" />
       <method v="2" />
     </configuration>
     <configuration name="单元测试(批处理模式)" type="RunUnityExe" factoryName="Unity Executable">
-      <option name="EXE_PATH" value="E:\ruanJian\2022.3.0f1c1\Editor\Unity.exe" />
+      <option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2022.3.0f1c1\Editor\Unity.exe" />
       <option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient -testResults Logs/results.xml -logFile Logs/Editor.log -testPlatform EditMode -debugCodeOptimization" />
       <option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient" />
       <option name="PASS_PARENT_ENVS" value="1" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
       <option name="ENV_FILE_PATHS" value="" />
       <option name="REDIRECT_INPUT_PATH" value="" />
-      <option name="PTY_MODE" value="Auto" />
       <option name="MIXED_MODE_DEBUG" value="0" />
       <method v="2" />
     </configuration>
@@ -107,7 +182,7 @@
       <option name="useMixedMode" value="false" />
       <method v="2" />
     </configuration>
-    <configuration name="附加到设备" type="UnityDevicePlayer" factoryName="UnityAttachToDevicePlayer">
+    <configuration name="附加到" type="UnityDevicePlayer" factoryName="UnityAttachToDevicePlayer">
       <method v="2" />
     </configuration>
   </component>
@@ -153,6 +228,7 @@
       <workItem from="1761658194047" duration="1891000" />
       <workItem from="1761745064582" duration="351000" />
       <workItem from="1761798323592" duration="6580000" />
+      <workItem from="1765455415992" duration="1066000" />
     </task>
     <servers />
   </component>
@@ -175,14 +251,7 @@
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
           <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/LoginController.cs</url>
           <line>325</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Controller\LoginController.cs" containingFunctionPresentation="方法 'OnLoadConfigsEnterGame'">
-            <startOffsets>
-              <option value="13223" />
-            </startOffsets>
-            <endOffsets>
-              <option value="13241" />
-            </endOffsets>
-          </properties>
+          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Controller\LoginController.cs" containingFunctionPresentation="方法 'OnLoadConfigsEnterGame'" />
           <option name="timeStamp" value="46" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DotNet Breakpoints">

+ 0 - 5
GameClient/Assets/AssetBundleCollectorSetting.asset

@@ -78,11 +78,6 @@ MonoBehaviour:
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
-    - GroupName: launcher
-      GroupDesc: 
-      AssetTags: preload
-      ActiveRuleName: EnableGroup
-      Collectors: []
     - GroupName: dressup
       GroupDesc: 
       AssetTags: dynamic

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.fadeMotionList.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 403ae2dd693bb1d4b924f6b8d206b053, type: 3}
   m_Name: Mao.fadeMotionList
   m_EditorClassIdentifier: 
-  MotionInstanceIds: be7d0100267f0100c09701006a9801007c740100708c0100da8c0100c67d0100
+  MotionInstanceIds: 365d01009e5e010040770100ea770100f0530100ee6b0100586c01003e5d0100
   CubismFadeMotionObjects:
   - {fileID: 11400000, guid: c6a5276089e6b2c4bb2f78cca94c4ded, type: 2}
   - {fileID: 11400000, guid: a0145e27134640343b894f03870256bc, type: 2}

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_01.anim

@@ -11378,5 +11378,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 101488
+    intParameter: 93166
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_02.anim

@@ -12098,5 +12098,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 95356
+    intParameter: 87024
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_03.anim

@@ -11774,5 +11774,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 98086
+    intParameter: 89758
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_04.anim

@@ -12944,5 +12944,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 101594
+    intParameter: 93272
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/sample_01.anim

@@ -11168,5 +11168,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 104384
+    intParameter: 96064
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_01.anim

@@ -15266,5 +15266,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 97734
+    intParameter: 89406
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_02.anim

@@ -17336,5 +17336,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 97726
+    intParameter: 89398
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_03.anim

@@ -18134,5 +18134,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 104554
+    intParameter: 96234
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.fadeMotionList.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 403ae2dd693bb1d4b924f6b8d206b053, type: 3}
   m_Name: Natori.fadeMotionList
   m_EditorClassIdentifier: 
-  MotionInstanceIds: 6a890100367c010028820100848c0100fc960100707901007a9801005a7401001c920100
+  MotionInstanceIds: e6680100ae5b0100a4610100026c01007c760100e8580100fa770100ce5301009a710100
   CubismFadeMotionObjects:
   - {fileID: 11400000, guid: b211dc549c58a9e448169cc818f5edfa, type: 2}
   - {fileID: 11400000, guid: 145e4856478ab1540affc40745dbea64, type: 2}

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_00.anim

@@ -731,5 +731,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 102940
+    intParameter: 94618
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_01.anim

@@ -6842,5 +6842,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 101508
+    intParameter: 93186
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_02.anim

@@ -9107,5 +9107,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 96624
+    intParameter: 88296
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_03.anim

@@ -9668,5 +9668,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 104570
+    intParameter: 96250
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_04.anim

@@ -10931,5 +10931,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 98856
+    intParameter: 90532
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_05.anim

@@ -10211,5 +10211,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 104188
+    intParameter: 95868
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_06.anim

@@ -10199,5 +10199,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 97334
+    intParameter: 89006
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_07.anim

@@ -9533,5 +9533,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 100714
+    intParameter: 92390
     messageOptions: 1

+ 1 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_08.anim

@@ -9083,5 +9083,5 @@ AnimationClip:
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 95322
+    intParameter: 86990
     messageOptions: 1

+ 1 - 1
GameClient/ProjectSettings/ProjectSettings.asset

@@ -779,7 +779,7 @@ PlayerSettings:
   webGLTemplate: PROJECT:MyCustomTemplate
   webGLAnalyzeBuildSize: 0
   webGLUseEmbeddedResources: 0
-  webGLCompressionFormat: 2
+  webGLCompressionFormat: 1
   webGLWasmArithmeticExceptions: 0
   webGLLinkerTarget: 1
   webGLThreadsSupport: 0

+ 86 - 86
GameClient/UserSettings/Layouts/default-2022.dwlt

@@ -16,12 +16,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 43
-    width: 2560
-    height: 1357
+    width: 1920
+    height: 989
   m_ShowMode: 4
-  m_Title: Console
+  m_Title: Project
   m_RootView: {fileID: 6}
-  m_MinSize: {x: 875, y: 321}
+  m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
 --- !u!114 &2
@@ -40,11 +40,11 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 800
-    width: 711
-    height: 507
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+    y: 575
+    width: 535
+    height: 364
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 13}
@@ -67,14 +67,14 @@ MonoBehaviour:
   - {fileID: 2}
   m_Position:
     serializedVersion: 2
-    x: 1849
+    x: 1385
     y: 0
-    width: 711
-    height: 1307
+    width: 535
+    height: 939
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 134
+  controlID: 402
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -90,12 +90,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1505
+    x: 1128
     y: 0
-    width: 344
-    height: 1307
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+    width: 257
+    height: 939
+  m_MinSize: {x: 277, y: 71}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
@@ -118,8 +118,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 773
-    height: 1307
+    width: 579
+    height: 939
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 18}
@@ -147,8 +147,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2560
-    height: 1357
+    width: 1920
+    height: 989
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -172,7 +172,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2560
+    width: 1920
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -199,12 +199,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2560
-    height: 1307
+    width: 1920
+    height: 939
   m_MinSize: {x: 500, y: 100}
   m_MaxSize: {x: 40480, y: 16192}
   vertical: 0
-  controlID: 133
+  controlID: 281
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -221,8 +221,8 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1337
-    width: 2560
+    y: 969
+    width: 1920
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -241,12 +241,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1220
+    x: 914
     y: 0
-    width: 285
-    height: 1307
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+    width: 214
+    height: 939
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -269,8 +269,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 711
-    height: 800
+    width: 535
+    height: 575
   m_MinSize: {x: 231, y: 271}
   m_MaxSize: {x: 10001, y: 10021}
   m_ActualView: {fileID: 17}
@@ -293,12 +293,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 773
+    x: 579
     y: 0
-    width: 447
-    height: 1307
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+    width: 335
+    height: 939
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 19}
   m_Panes:
   - {fileID: 19}
@@ -325,10 +325,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1849
-    y: 873
-    width: 710
-    height: 486
+    x: 1385
+    y: 648
+    width: 534
+    height: 343
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -429,10 +429,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1220
+    x: 914
     y: 73
-    width: 283
-    height: 1286
+    width: 212
+    height: 918
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -446,9 +446,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: fcbf0000
+      m_SelectedIDs: c84c0000
       m_LastClickedID: 0
-      m_ExpandedIDs: 7ac5feffbcdbfeff1efbffff
+      m_ExpandedIDs: 2a7bd7ff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -492,10 +492,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1505
+    x: 1128
     y: 73
-    width: 342
-    height: 1286
+    width: 255
+    height: 918
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -539,10 +539,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1849
+    x: 1385
     y: 73
-    width: 710
-    height: 779
+    width: 534
+    height: 554
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -566,7 +566,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Plugins
+    - Packages
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -574,16 +574,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/Plugins/HybridCLR
+  - Packages
   m_LastFoldersGridSize: -1
-  m_LastProjectPath: D:\Client\Client\GameClient
+  m_LastProjectPath: F:\GFG_webgl_v2\client_webgl\GameClient
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 77}
-    m_SelectedIDs: fcbf0000
-    m_LastClickedID: 49148
-    m_ExpandedIDs: 0000000052bf000054bf000058bf00005abf00005cbf00005ebf000060bf000062bf000064bf000066bf00006abf00006ebf0000f4bf0000fcbf000018da000042da000000ca9a3b
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: ffffff7f
+    m_LastClickedID: 2147483647
+    m_ExpandedIDs: 00000000ea0500003206000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -611,7 +611,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000052bf000054bf000056bf000058bf00005abf00005cbf00005ebf000060bf000062bf000064bf000066bf000068bf00006abf00006cbf00006ebf000070bf000072bf0000
+    m_ExpandedIDs: 00000000ea05000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -638,7 +638,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 3ac8000028d3000068c90700
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -689,8 +689,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 772
-    height: 1286
+    width: 578
+    height: 918
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -707,7 +707,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 1080, y: 1920}
+  m_TargetSize: {x: 3840, y: 2160}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -716,16 +716,16 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 0a000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 06000000000000000000000000000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -540
-    m_HBaseRangeMax: 540
-    m_VBaseRangeMin: -960
-    m_VBaseRangeMax: 960
+    m_HBaseRangeMin: -1920
+    m_HBaseRangeMax: 1920
+    m_VBaseRangeMin: -1080
+    m_VBaseRangeMax: 1080
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -743,23 +743,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 772
-      height: 1265
-    m_Scale: {x: 0.6588542, y: 0.6588542}
-    m_Translation: {x: 386, y: 632.5}
+      width: 578
+      height: 897
+    m_Scale: {x: 0.15052083, y: 0.15052083}
+    m_Translation: {x: 289, y: 448.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -585.8656
-      y: -960
-      width: 1171.7312
-      height: 1920
+      x: -1920
+      y: -2979.654
+      width: 3840
+      height: 5959.308
     m_MinimalGUI: 1
-  m_defaultScale: 0.6588542
-  m_LastWindowPixelSize: {x: 772, y: 1286}
+  m_defaultScale: 0.15052083
+  m_LastWindowPixelSize: {x: 578, y: 918}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -785,10 +785,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 773
+    x: 579
     y: 73
-    width: 445
-    height: 1286
+    width: 333
+    height: 918
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -804,7 +804,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 1
       snapOffset: {x: -156, y: -26}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: -10, y: 0}
       snapCorner: 3
       id: Tool Settings
       index: 0