docs(config): add meta files for kingdom skill config docs

add metadata files for the two newly added configuration documents about geometric kingdom skills

.trae/documents/2026-05-22-skill-template-refactor-design-plan.md

@@ -1,49 +0,0 @@
-# 技能配置重构实施计划
-
-## 1. 探索阶段总结 (Current State Analysis)
-经过对代码库的探索，当前技能触发系统及相关配置状态如下：
-- `SkillSet.ts` 包含了所有技能的基座配置 `SkillConfig` 和技能字典 `SkillSet`。
-- `heroSet.ts` 中的 `HeroInfo` 存放英雄和怪物的配置，目前 `call`, `dead`, `fstart`, `fend` 被定义为 `number[]`，而 `atking` 和 `atked` 被定义为 `{s_uuid: number, t_num: number}[]`。
-- `HeroAttrsComp.ts` 内部存储了与配置一致的触发技能结构。
-- `SkillTriggerHelper.ts` 负责判定并向外派发 `GameEvent.TriggerSkill` 事件，由 `SCastSystem.ts` 监听并执行 `forceCastTriggerSkill`。
-- 目前 `SCastSystem.ts` 在收集技能目标和施放技能时，都是直接从 `SkillSet[s_uuid]` 读取 `config`，没有针对具体角色的差异化机制。
-
-## 2. 拟议变更 (Proposed Changes)
-
-### 2.1 修改 `SkillSet.ts`
-- **新增接口**：定义 `SkillOverrides` 接口，包含所有可被角色覆盖的技能参数（如 `TGroup`, `ap`, `hit_count`, `buffs` 等，全部为可选字段）。
-- **新增函数**：编写 `mergeSkillParams(config, overrides?)` 函数，将基座 `config` 和角色覆盖 `overrides` 进行合并，返回一个新的 `SkillConfig` 对象。
-
-### 2.2 修改 `heroSet.ts`
-- **扩展接口**：
-  - 在 `HSkillInfo` 接口中增加 `overrides?: SkillOverrides;`。
-  - 将 `heroInfo` 接口中的触发字段 `call`, `dead`, `fstart`, `fend`, `atking`, `atked` 统一更新为 `{ s_uuid: number; t_num: number; overrides?: SkillOverrides }[]` 结构。
-- **更新配置示例**：按照设计文档更新英雄 `5001`, `5002`, `5301`, `5302` 的配置，为特定的触发技能添加 `overrides` 字段（如盾骑士 5002 全队护盾覆盖）。
-
-### 2.3 修改 `HeroAttrsComp.ts`
-- **同步类型**：将 `call`, `dead`, `fstart`, `fend`, `atking`, `atked` 的类型同步改为与 `heroInfo` 一致的 `{ s_uuid: number; t_num: number; overrides?: SkillOverrides }[]`。
-
-### 2.4 修改 `SkillTriggerHelper.ts`
-- **派发支持**：
-  - 更新 `dispatchSingle` 方法签名，增加 `overrides?: SkillOverrides` 参数，并在 `oops.message.dispatchEvent(GameEvent.TriggerSkill, {...})` 中将其传入。
-  - 更新 `handleCall`, `handleDead`, `handleArrayTrigger` 处理逻辑，将原先对 `number[]` 的处理改为对 `{s_uuid, t_num, overrides}` 对象数组的处理，并提取 `overrides` 传递给 `dispatchArray`。
-  - 更新 `handleAtking`, `handleAtked` 中的 `dispatchSingle` 调用，传入 `atkConfig.overrides`。
-
-### 2.5 修改 `SCastSystem.ts` (关键运行时逻辑)
-- **事件监听更新**：在 `onTriggerSkill` 方法的 `args` 参数定义中补充 `overrides?: SkillOverrides`，并传递给 `forceCastTriggerSkill`。
-- **合并逻辑上移（架构优化）**：
-  - 在 `forceCastTriggerSkill` 和 `castSkill` 的**方法入口处**（而非 `applyFriendlySkillEffects` 内部），第一时间调用 `mergeSkillParams(config, overrides)` 获取 `effective` 技能配置。
-  - 将后续所有关于阵营判定（如 `effective.TGroup`）、目标收集、以及传递给 `applyFriendlySkillEffects` / `applyEnemySkillEffects` 的参数全部替换为 `effective`。
-  - **为何如此设计**：如果在原设计中仅在 `applyFriendlySkillEffects` 入口处合并，那么前置的**目标选择逻辑**（依赖 `TGroup` 判定是 `Self` 还是 `Team`）将会使用未合并的基础配置，导致类似“自己加盾变为全队加盾”的 `TGroup` 覆盖无法生效。将合并操作前置可以彻底解决这一问题。
-- **主动技能支持**：在 `pickCastSkill` 中，读取 `heroAttrs.skills[s_uuid]?.overrides` 并进行合并判定，同时将 `overrides` 放入返回的 `castPlan` 中，以便 `castSkill` 使用。
-
-## 3. 假设与决策 (Assumptions & Decisions)
-- **统一触发结构**：虽然 `call`, `dead`, `fstart`, `fend` 不严格需要 `t_num`，但为了类型统一并完全遵守设计规范，统一采用了包含 `t_num` 的对象结构。
-- **合并前置决策**：如上所述，坚决在施放方法入口处进行 `mergeSkillParams` 以保证目标收集逻辑能够感知到 `TGroup` 的变化。这比设计规范中要求的修改范围略有扩大，但对于系统功能的正确实现是必须的。
-- **卡牌技能影响**：卡牌技能（`forceCastCardSkill`）当前没有绑定角色的 `overrides`，因此维持读取基础 `SkillSet` 逻辑不变。
-
-## 4. 验证步骤 (Verification steps)
-1. 编译 TypeScript 代码，确保 `HeroAttrsComp`, `heroSet`, `SCastSystem` 等修改后的接口和类型无报错。
-2. 启动游戏或运行测试，确认 `5001` (见习战士) 触发的基础护盾只对自己生效。
-3. 确认 `5002` (盾骑士) 受击触发的护盾技能，正确地为全队附加护盾，并且护盾值（ap）与次数（hit_count）符合 `overrides` 配置。
-4. 确认所有旧版英雄技能在无 `overrides` 时能够正确回退到 `SkillSet` 的默认配置，游戏运转正常无异常日志。

.trae/documents/plan_hero_ui_refactor.md

@@ -1,55 +0,0 @@
-# 重构场上英雄UI表现及交互计划
-
-## 1. 目标与现状分析
-
-**现状**：
-目前游戏中 `HInfoComp.ts` 负责在界面下方显示场上英雄的信息（生命、攻击、出售），由 `MissionCardComp` 管理 6 个固定槽位。
-`HeroViewComp.ts` 负责战斗场景中英雄实体的动画表现。
-
-**目标**：
-1. 保留 `HInfoComp.ts` 组件及预制体，但**取消其在底部的常驻显示**，将其改造为**弹窗形式**（类似 `IBoxComp`）。
-2. 在战斗或准备阶段，玩家**直接点击场上的英雄模型**（`HeroViewComp`）时，弹出 `HInfoComp` 面板。
-3. 清理 `MissionCardComp.ts` 中管理底层 `HInfoComp` 的旧逻辑。
-
-## 2. 具体修改步骤
-
-### 2.1 注册 HInfo 为独立弹窗
-* 修改 `assets/script/game/common/config/GameUIConfig.ts`：
-  * 在 `UIID` 枚举中添加 `HInfo`。
-  * 在 `UIConfigData` 中注册：`[UIID.HInfo]: { layer: LayerType.UI, prefab: "gui/element/hnode" }`。
-
-### 2.2 改造 HInfoComp.ts
-* **数据传入**：添加 `onAdded(args: { eid: number })`，根据 `eid` 查询 `HeroAttrsComp` 实体进行数据绑定。
-* **自驱动刷新**：原先由外部驱动刷新，现在添加 `update(dt: number)` 生命周期，在内部调用 `this.refresh()` 以保持血量等信息实时更新。
-* **移除旧逻辑**：删除 `node_index`、`refreshByNodeIndex` 等固定槽位相关的代码。
-* **交互恢复**：取消注释 `bindEvents` 和 `unbindEvents`，恢复出售按钮的点击事件。出售完成后调用 `oops.gui.remove(UIID.HInfo)`。打开 `IBox` 的点击逻辑可保持不变（或者作为详情按钮）。
-* **添加关闭机制**：考虑到它是弹窗，可以添加一个点击非按钮区域关闭自身的功能，或者点击英雄之外的区域关闭。为简单起见，可以暂时复用点击面板打开 IBox（同时关闭 HInfo），并在 HInfo 添加额外的关闭按钮，或由 UI 框架自动处理（如果注册为 PopUp 并带有背景）。如果它是纯 UI，可以点击其他地方关闭。这里我们让它在打开 `IBox` 后关闭自己：`oops.gui.remove(UIID.HInfo)`。
-
-### 2.3 清理 MissionCardComp.ts
-* **移除属性**：删除 `@property(Node) hero_info_node` 和 `@property(Prefab) hero_info_prefab` 及其编辑器绑定。
-* **移除内部状态**：删除 `cachedHInfoComps` 和 `heroInfoSyncTimer`。
-* **移除生命周期调用**：在 `onLoad`、`update`、`onMissionStart`、`onMissionEnd`、`onDestroy`、`reset`、`enterPreparePhase`、`enterBattlePhase` 中，删除所有涉及 `HInfoComp` 实例创建、刷新、显隐控制、销毁的代码。
-
-### 2.4 修改 HeroViewComp.ts 添加点击交互
-* **绑定事件**：在 `onLoad` 中为英雄模型节点绑定点击事件 `this.node.on(NodeEventType.TOUCH_END, this.onHeroClicked, this);`，并在 `reset` 等清理处解绑。
-* **点击回调逻辑**：
-  ```typescript
-  private onHeroClicked(event: EventTouch) {
-      if (!this.model) return;
-      if (this.model.fac !== FacSet.HERO) return; // 仅对玩家英雄生效
-      
-      const eid = this.ent?.eid;
-      if (!eid) return;
-      
-      // 呼出英雄信息弹窗
-      oops.gui.remove(UIID.HInfo);
-      oops.gui.open(UIID.HInfo, { eid: eid });
-  }
-  ```
-
-## 3. 验证步骤
-1. 进入战斗，确认下方不再有常驻的英雄信息面板。
-2. 点击场上的英雄模型，确认能弹出该英雄的 `HInfoComp` 弹窗。
-3. 观察弹窗内的血量和攻击力是否能随战斗实时刷新。
-4. 点击弹窗上的出售按钮，确认英雄消失、金币增加且弹窗关闭。
-5. 点击弹窗上的信息区域，确认能弹出 `IBoxComp` 详情面板。

.trae/documents/plan_spawn_flow_improvement.md

@@ -0,0 +1,247 @@
+# 刷怪心流改造 · 实施步骤与执行方案
+
+> 基于对 RogueConfig.ts / MissionMonComp.ts / MissionComp.ts 的多 agent 调研与方案讨论产出。
+> 目标：让刷怪节奏产生"爽感"与心流（Flow），核心公式：**爽感 = 密度 × 可清性**，**心流 = 铺垫 → 峰值 → 释放循环 + 即时正反馈**。
+
+---
+
+## 阶段划分总览
+
+```
+阶段一（P0 修复，4 项）          → 安全网与曲线修正，不动体验结构
+阶段二（P1 节奏与 DDA，5 项）     → 核心体验重塑，依赖链严格
+阶段三（P2-P3 反馈层，5 项）      → 情绪反馈补全，可并行开发
+```
+
+---
+
+## 阶段一：P0 修复
+
+### Step 1.1 — P0-3 刷怪暂停死链路（先做：泄压阀）
+
+**改动文件**：MissionMonComp.ts、MissionComp.ts
+
+| # | 操作 | 位置 |
+|---|---|---|
+| 1 | `update()` 在 pending 统计之后、批次推进之前插入 `if (smc.mission.stop_spawn_mon) return;` | MissionMonComp L106 后 |
+| 2 | 阈值对齐：`maxMonsterCount` 80→60，`resumeMonsterCount` 45→40 | MissionComp L86-88 |
+| 3 | `changePhase(PrepareEnd)` 分支补 `smc.mission.stop_spawn_mon = false;`（防开局冻结 4 秒） | MissionComp L492-495 |
+
+**验证**：临时 `maxMonsterCount=20` 进放松回合，确认到 20 只停刷、降 15 后续刷；wave 1 开局节奏无延迟。
+
+**Commit**：`fix(mission): consume stop_spawn_mon in MissionMonComp update`
+
+---
+
+### Step 1.2 — P0-4 回合僵局超时（安全网）
+
+**改动文件**：RogueConfig.ts、MissionComp.ts
+
+| # | 操作 | 位置 |
+|---|---|---|
+| 1 | 新增常量 `WAVE_TIMEOUT = 75`（含 JSDoc） | RogueConfig 节奏常量区 |
+| 2 | MissionComp 新增字段 `skipRemainScoreOnBattleEnd`，`data_init` 复位 | MissionComp 运行时状态区 + L774 |
+| 3 | Battle 阶段 update 追加超时检测 `if (this.clearTime >= timeout) this.onBattleTimeout();`（timeout 取 `isBossWave ? 90 : WAVE_TIMEOUT`） | MissionComp L245-251 |
+| 4 | 新增 `onBattleTimeout()`：先扣 `wave_remain_monsters` → 销毁全部 MON 实体 → `mon_num=0` → 走 `TimeUpAdvanceWave` / `open_Victory` | MissionComp 回合管理区 |
+| 5 | BattleEnd 的 `wave_remain_monsters += mon_num` 加防重判断 | MissionComp L522-523 |
+
+**验证**：临时 `WAVE_TIMEOUT=8`，确认 8 秒准点收束、评分已扣、factor 放水；TestModeConfig 高血怪模拟僵局验证 75s 前不结束。
+
+**Commit**：`feat(mission): add wave battle timeout fallback`
+
+---
+
+### Step 1.3 — P0-1 Wave 1 错位修正
+
+**改动文件**：RogueConfig.ts（单文件）
+
+| # | 操作 | 位置 |
+|---|---|---|
+| 1 | `getWaveType`：`wave % 5 === 1` → `wave % 5 === 4` | L80 |
+| 2 | 同步 4 处注释：WaveType 枚举注释（L37）、文件头节奏注释（L21-23）、WaveConfigs 表头注释（L329-332）、表内"放松回合"行内注释从 wave 6/11/16 搬到 4/9/14 | 见左 |
+
+**验证**：`getWaveType(1..20)` 断言输出 `N N N R P` × 4 循环；实机确认 wave 1 = 18 只、wave 4 ≈ 40 只低强度。
+
+**Commit**：`fix(rogue): move relax wave to pre-boss slot (wave%5==4)`
+
+---
+
+### Step 1.4 — P0-2 Boss 压轴 + 预警
+
+**改动文件**：RogueConfig.ts、MissionComp.ts、GameEvent.ts
+
+| # | 操作 | 位置 |
+|---|---|---|
+| 1 | `SquadLibrary` 新增 `boss_guard`（weight:0，1 重甲+2 近战） | RogueConfig L191-198 |
+| 2 | `GeneratedMonster` 增加可选字段 `isBossGuard?: boolean` | RogueConfig L426-450 |
+| 3 | `generateWave` 重构第 3/4/8 步：Boss 不 push 首位 → 小队拼装 → 护卫队 `makeBossGuards()` → Boss 压队尾 → 批次统一分配后强制 Boss+护卫 `batch = BATCH_COUNT-1`；`remaining` 改为 `-= 4` | RogueConfig L509-554 |
+| 4 | `makeBoss` 的 `spawnIndex:0, batch:0` 改为占位默认值+注释 | RogueConfig L660-687 |
+| 5 | GameEvent 新增 `BossWarning = "BossWarning"` | GameEvent.ts |
+| 6 | `changePhase(BattleStart)`：`if (this.isBossWave)` 派发 `BossWarning { wave, eta: 20 }` | MissionComp L497-500 |
+| 7 | MissionComp 从 RogueConfig 补导入 `BATCH_INTERVAL, BATCH_COUNT` | MissionComp L51 |
+
+**验证**：wave 5 确认 0s/10s 两批纯杂兵、20s Boss 带 3 护卫进场、总怪数=21；`BossWarning` 仅在 5/10/15/20 派发。
+
+**Commit**：`feat(rogue): spawn boss in final batch with guards and warning event`
+
+---
+
+## 阶段二：P1 节奏与 DDA（依赖链严格）
+
+依赖链：**P1-5 → P1-1 → P1-2 + P1-3（同批）→ P1-4**
+
+### Step 2.1 — P1-5 数值语义澄清（等价变换先行）
+
+**改动文件**：RogueConfig.ts（单文件）
+
+| # | 操作 |
+|---|---|
+| 1 | 删除第 5 步（乘 hp_mul/ap_mul），第 6 步改为拆分 `hpScale = targetPower × hp_mul / totalBasePower`、`apScale = targetPower × ap_mul / totalBasePower` |
+| 2 | 更新文件头公式注释（L12-16）与 `hp_mul/ap_mul` 字段注释 |
+| 3 | 17/18/19 启用 `power_adjust: 1.05 / 1.10 / 1.20` |
+| 4 | `validateRogueConfig` 增加 `power_adjust ∈ [0.8, 1.3]` 校验 |
+
+**验证**：改造前后固定 heroPower 打桩，逐怪 hp/ap 断言相等（等价回归）；17/18/19 总强度阶梯断言。
+
+**Commit**：`refactor(rogue): unify hp/ap mul into power scaling formula`
+
+---
+
+### Step 2.2 — P1-1 批次递增 + 间隔参数化
+
+**改动文件**：RogueConfig.ts、MissionMonComp.ts
+
+| # | 操作 |
+|---|---|
+| 1 | 新增 `BATCH_RATIO = [0.25, 0.35, 0.40]`、`FINALE_SQUAD_COUNT = 2`、`SPAWN_INTERVAL_BY_TYPE`（Normal 0.18 / Pressure 0.25 / Relax 0.12） |
+| 2 | 批次分配从 `i % 3` 改为 `assignBatches()`：配额切分 + 第三批补 2 个最强小队（`pickStrongestSquad` 按 `calcHeroPower(样本)×count` 评分）；放松回合跳过收尾加压；`totalCount` 预留收尾小队名额防 `slice` 截掉 |
+| 3 | MissionMonComp：`MON_SPAWN_INTERVAL` 静态常量改为实例字段 `spawnInterval`，`onPhasePrepareEnd` 按 `getWaveType(currentWave)` 查表；`releaseCurrentBatch` 末尾的 spawnTimer 初始化同步改 |
+
+**与 P0-2 的合并点**：`assignBatches` 需保留"Boss+护卫强制最后一批"逻辑。
+
+**验证**：debugMode 日志打印每批只数与最强小队 id；放松回合 54 只应 ~6.5s 倾泻完。
+
+**Commit**：`feat(rogue): progressive batch ratio and per-type spawn interval`
+
+---
+
+### Step 2.3 — P1-2 + P1-3 清场加速与 DDA 重做（**必须同 commit**）
+
+**改动文件**：RogueConfig.ts、MissionMonComp.ts、MissionComp.ts、GameSet.ts
+
+P1-2 部分（MissionMonComp）：
+
+| # | 操作 |
+|---|---|
+| 1 | 新增状态：`batchReleasedCount`、`batchFastForwarded`、`aliveCheckTimer`、`waveEarlySkipTotal`（public 只读） |
+| 2 | `releaseCurrentBatch` 记录当批数量；update 中 0.2s 节流调 `checkBatchEarlyAdvance()` |
+| 3 | `checkBatchEarlyAdvance`：存活比例 ≤25% 且本批已放完 → `batchTimer += 2s`、`waveEarlySkipTotal += 2`（每批一次） |
+
+P1-3 部分（RogueConfig + MissionComp + GameSet）：
+
+| # | 操作 |
+|---|---|
+| 1 | `DynamicTuner` 重写：连续映射 `desired = 1 + (0.8 - clearTime/30) × 0.5`（死亡锚定 0.8）、滞回 2 回合、指数靠拢 50%、区间 [0.7, 1.3]、新增 `streak` 字段 |
+| 2 | MissionComp BattleEnd：`effectiveClearTime = clearTime + MonComp.waveEarlySkipTotal` 后传入 adjust；顺手写入 `lastWaveDeathCount`/`lastWaveClearTime` 快照（供 Step 2.4） |
+| 3 | `FightSet.WAVE_HEAL_RATE` 0.5→0.4；修正 MissionComp L676"恢复70%"幽灵注释 |
+
+**验证**：脚本模拟三种 clearTime 曲线（恒 12s / 恒 25s / 交替）打印 20 回合 factor 轨迹；强 build 单回合时长应从 ~30s 压到 ~24-26s。
+
+**Commit**：`feat(rogue): early batch advance and continuous DDA with hysteresis`
+
+---
+
+### Step 2.4 — P1-4 动态回合倒计时
+
+**改动文件**：MissionComp.ts（单文件）
+
+| # | 操作 |
+|---|---|
+| 1 | 新增档位常量 `COUNTDOWN_FAST=2.5 / NORMAL=4.0 / FULL=5.0`，删除/降级 `WAVE_COUNTDOWN_DURATION` |
+| 2 | `startWaveCountdown` 改调 `computeCountdown()`：有死亡→5s，clearTime<65%→2.5s，否则 4s（读 Step 2.3 写入的快照字段） |
+
+**验证**：快清场回合倒计时显示 3→2→1；有死亡回合给满 5s。
+
+**Commit**：`feat(mission): adaptive wave countdown based on last wave performance`
+
+---
+
+## 阶段三：P2-P3 反馈层
+
+### Step 3.1 — 事件与工具基建 + P2-2 清屏庆祝 + P2-3 Boss 演出
+
+**改动文件**：GameEvent.ts、MissionComp.ts、MissionMonComp.ts、**新增** ScreenShake.ts、**新增** BattleBannerComp.ts、mission.prefab（编辑器）
+
+| # | 操作 |
+|---|---|
+| 1 | GameEvent 新增：`WaveClear` / `BossWarning`（Step 1.4 已加则跳过）/ `BossSpawn` / `CoinFly` / `ComboReach`，启用 `MonDead` |
+| 2 | 新增 `ScreenShake` 静态工具（抖 `smc.map.MapView.node`，强度/时长参数，收敛回原位） |
+| 3 | 新增 `BattleBannerComp`：统一横幅通道（右进 backOut → 停留 → 左出 backIn），监听 WaveClear/BossWarning/ComboReach，0.3s 去抖 |
+| 4 | MissionComp 清屏分支 dispatch `WaveClear { wave, clearTime, allAlive, fastClear }`（通关分支不派发） |
+| 5 | MissionMonComp `addMonsterAtGrid` isBoss 分支 dispatch `BossSpawn { pos }` |
+| 6 | 奖励规则：fastClear=1 → +2 金，=2 → +5 金，allAlive → +1 刷新石（走 MissionEconomy） |
+| 7 | **编辑器操作**：mission.prefab 新增 `banner` 节点（Label+背景），挂 BattleBannerComp |
+
+**Commit**：`feat(battle): wave clear banner, boss warning and screen shake`
+
+---
+
+### Step 3.2 — P2-1 波次 HUD + P2-4 金币飞行
+
+**改动文件**：**新增** WaveHudComp.ts、**新增** CoinFlyComp.ts、HeroAtkSystem.ts、mission.prefab（编辑器）
+
+| # | 操作 |
+|---|---|
+| 1 | `WaveHudComp`：监听 NewWave 缓存 total；0.2s 轮询 `mon_num + pending_mon_num` 刷新进度条；静态生成 20 格旗帜（`getWaveType(i)===Pressure` 置 Boss 帧），当前回合脉动 |
+| 2 | HeroAtkSystem `scheduleDrop` 后 dispatch `CoinFly { worldPos, gold, isBoss }`；`onDeath` MON 分支 dispatch `MonDead` |
+| 3 | `CoinFlyComp`：独立 NodePool（上限 30），3-5 枚（Boss 8 枚）金币抛物线散开→加速飞向钱包；金币帧运行时取编辑器绑定的 `coinIconSrc.spriteFrame`；**账务立即结算、飞行纯表现** |
+| 4 | **编辑器操作**：prefab 新增 `wave_hud`（wave_lab/remain_lab/progress/flags）与 `fly_layer`（最高 sibling），挂组件并拖绑定 |
+
+**Commit**：`feat(battle): wave progress HUD and coin fly animation`
+
+---
+
+### Step 3.3 — P3-1 连杀 Combo
+
+**改动文件**：**新增** ComboComp.ts、mission.prefab（编辑器）
+
+| # | 操作 |
+|---|---|
+| 1 | `ComboComp`：监听 MonDead，2s 滑动窗口计数，5/10/20 阈值派发 `ComboReach { count, tier }`；MissionEnd 清零 |
+| 2 | BattleBannerComp 消费 ComboReach：分级文案/颜色/震屏（tier2 `shake(8,0.3)`）+ 金币爆发 2/5/10 |
+| 3 | **编辑器操作**：prefab 挂 ComboComp |
+
+**Commit**：`feat(battle): kill combo system with tiered rewards`
+
+---
+
+## 执行约束
+
+**每次 commit 前必做**：
+1. `validateRogueConfig()` 返回空数组
+2. GetDiagnostics 检查改动文件无 TS 错误
+3. 手动验证项按各 Step 的验证清单执行
+
+**Commit message** 遵循项目规范（Conventional Commits、英文、祈使句、≤50 字符）。
+
+**资源依赖**（不阻塞开发，可后期补）：Boss 旗帜帧 ×1、清屏/Boss 预警/连杀音效 ×5、金币入袋音效 ×1——占位方案：flash/dun/Hit/Critical/Fire/button 复用。
+
+**风险最高的两步**：Step 1.1（PrepareEnd 时序坑）和 Step 2.3（P1-2/P1-3 必须同批）。实施时优先单独验证这两点。
+
+---
+
+## 附录：关键数值速查
+
+| 参数 | 现值 | 目标值 | 所属 Step |
+|---|---|---|---|
+| getWaveType Relax 位 | wave%5==1 | wave%5==4 | 1.3 |
+| Boss 批次 | batch 0 | batch 2 + 3 护卫 | 1.4 |
+| maxMonsterCount / resume | 80 / 45 | 60 / 40 | 1.1 |
+| WAVE_TIMEOUT | 无 | 75s（Boss 90s） | 1.2 |
+| BATCH_RATIO | 33/33/33 | 25/35/40 + 收尾小队×2 | 2.2 |
+| 刷怪间隔 | 0.3s 统一 | Normal 0.18 / Pressure 0.25 / Relax 0.12 | 2.2 |
+| 清场加速 | 无 | 存活≤25% 时 batchTimer += 2s | 2.3 |
+| DynamicTuner | ±0.05 步进 [0.5, 2.0] | 连续映射+滞回 [0.7, 1.3] | 2.3 |
+| WAVE_HEAL_RATE | 0.5 | 0.4 | 2.3 |
+| 回合间倒计时 | 固定 5s | 2.5 / 4 / 5 三档 | 2.4 |
+| power_adjust 17/18/19 | 未使用 | 1.05 / 1.10 / 1.20 | 2.1 |

assets/Scripts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "3e36fd17-8df9-4f4f-8904-61ad60e7a3e9",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/Scripts/wx_clound_client_api.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "91afed13-a3a6-4666-8f0a-c3259c5f6fa5",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/Scripts/wx_clound_client_api/WxCloudApi.ts

@@ -0,0 +1,84 @@
+export type CloudReturnType<T = any> = {
+    code: number,// 200成功
+    msg?:string,
+    data?:T
+}
+
+export class WxCloudApi{
+    /**
+     * @en init the cloud
+     * @zh 初始化云客户端（只调用一次即可）
+     * @param {string} env 云环境名称
+     */
+    public static init(env:string){
+        wx?.cloud.init({
+            env: env
+        });
+    }
+
+    /**
+     * @en Login to the cloud
+     * @zh 登录云
+     * @return 返回结果
+     * 参考：
+     *  result.result = {
+     *      code: number, // 200成功，其他都是失败
+     *      msg: string, // 如果失败，这里是失败原因等信息
+     *      data: { // 成功才有
+     *          openid: string, // 用户微信平台openid
+     *          regist_time: number, // 时间戳，用户注册时间
+     *          game_data: object, // 开发者自己保存的数据
+     *      }
+     *  }
+     * 如果这个泛型令你报错（一般是因为你删了wx.api.d.ts导致），请使用以下签名：
+     * login():Promise<{result: CloudReturnType<{openid: string, regist_time: number, game_data: object}>}>
+     * 或者你是个“不拘小节”的老哥，可以用以下简洁版签名(参考上方的数据结构例子使用即可)
+     * login():Promise<any>
+     */
+    public static async login(): Promise<CloudCallFunctionResult<CloudReturnType<{
+        openid:string,
+        regist_time:number,
+        game_data:any
+    }>>>{
+        return await wx?.cloud.callFunction({
+            name: 'cocos_cloud',
+            data: {
+                cmd: "login"
+            }
+        });
+    }
+
+    /**
+     * @en Save game data to the cloud
+     * @zh 把客户端数据写入云，此为全覆盖写入，请自行管理完整数据
+     * @return 返回结果
+     * 参考：
+     *  result.result = {
+     *      code: number, // 200成功，其他都是失败
+     *      msg: string, // 如果失败，这里是失败原因等信息
+     *      data: {
+     *          errMsg: "document.update:ok", // 数据库返回结果
+     *          stats: {
+     *              updated: number, // 更新了几条数据（正常是1）
+     *          }
+     *      }
+     * 如果这个泛型令你报错（一般是因为你删了wx.api.d.ts导致），请使用以下签名：
+     * save(gameData: any): Promise<{resoult:CloudReturnType}>
+     * 或者你是个“不拘小节”的老哥，可以用以下简洁版签名(参考上方的数据结构例子使用即可)
+     * login():Promise<any>
+     */
+    public static async save(gameData: any): Promise<CloudCallFunctionResult<CloudReturnType<{
+        errMsg: string,
+        status:{
+            updated: number
+        }
+    }>>> {
+        return await wx?.cloud.callFunction({
+            name: 'cocos_cloud',
+            data: {
+                cmd: 'save',
+                data: gameData
+            }
+        });
+    }
+}

assets/Scripts/wx_clound_client_api/WxCloudApi.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "a3113d69-645e-4a4b-bf68-a434fcbd6d8d",
+  "uuid": "6cae54d1-19a6-458d-ba26-92e6ada39b58",
   "files": [],
   "subMetas": {},
   "userData": {}

assets/Scripts/wx_clound_client_api/wx.aip.d.ts

@@ -0,0 +1,29 @@
+// 注意：此文件是为了引入微信接口
+// !!如果这个文件，与你的wx.d.ts因为定义重复报错，你可以删除本文件!!
+
+// @ts-ignore
+declare class wx {
+    public static cloud: Cloud;
+}
+// @ts-ignore
+declare class Cloud {
+    public init(options: {
+        env?: string | {
+            database?: string
+            storage?: string
+            functions?: string
+        },
+        traceUser?: boolean//default true
+    });
+    public callFunction(obj: {
+        name: string,
+        data?: any,
+        config?: { env: string },
+    }): Promise<CloudCallFunctionResult>;
+}
+// @ts-ignore
+declare type CloudCallFunctionResult<T = any> = {
+    result: T,
+    errMsg: string,
+    requestID: string
+}

assets/Scripts/wx_clound_client_api/wx.aip.d.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "25122cff-7274-4f86-9f74-f82258b39fab",
+  "uuid": "c0e94674-fd35-4f37-a57c-694b85dddbd0",
   "files": [],
   "subMetas": {},
   "userData": {}

assets/resources/game/gui/shadow.prefab

@@ -20,22 +20,19 @@
     "_children": [
       {
         "__id__": 2
-      },
-      {
-        "__id__": 8
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 8
       },
       {
-        "__id__": 18
+        "__id__": 10
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 12
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -52,8 +49,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1.6,
-      "y": 0.2,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -75,7 +72,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 3
@@ -103,7 +100,7 @@
     "_lscale": {
       "__type__": "cc.Vec3",
       "x": 0.1,
-      "y": 1,
+      "y": 0.1,
       "z": 1
     },
     "_mobility": 0,
@@ -130,8 +127,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 200,
-      "height": 20
+      "width": 284,
+      "height": 39
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -172,7 +169,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -202,174 +199,6 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "blue",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 11
-      },
-      {
-        "__id__": 13
-      }
-    ],
-    "_prefab": {
-      "__id__": 15
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 0.2,
-      "y": 0.2,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 8
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 10
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 179,
-      "height": 179
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "50Zpp1+w1EWJcur+0brRim"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 8
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 12
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@d02e0",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "542qw+uwVGFYHfIPm7FYB9"
-  },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 8
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 14
-    },
-    "playOnLoad": true,
-    "_clips": [
-      {
-        "__uuid__": "8b2e64e9-6ac7-43ad-b955-aabe2c3a5b67",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": {
-      "__uuid__": "8b2e64e9-6ac7-43ad-b955-aabe2c3a5b67",
-      "__expectedType__": "cc.AnimationClip"
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "14hRfhjw9DR4jCS9aULrGW"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "eefnd533NBxL19tpkpDQLz",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -380,7 +209,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 9
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -408,7 +237,7 @@
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 19
+      "__id__": 11
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,

assets/resources/game/heros/ha1.prefab

@@ -22,38 +22,38 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 11
       },
       {
-        "__id__": 22
+        "__id__": 23
       },
       {
-        "__id__": 34
+        "__id__": 35
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 46
       },
       {
-        "__id__": 47
+        "__id__": 48
       },
       {
-        "__id__": 49
+        "__id__": 50
       },
       {
-        "__id__": 51
+        "__id__": 52
       },
       {
-        "__id__": 53
+        "__id__": 54
       },
       {
-        "__id__": 55
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 58
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -130,6 +130,9 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 10
       }
     ],
     "removedComponents": []
@@ -196,6 +199,16 @@
       "z": 0
     }
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_active"
+    ],
+    "value": false
+  },
   {
     "__type__": "cc.Node",
     "_name": "anm",
@@ -208,23 +221,23 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 11
+        "__id__": 12
       },
       {
-        "__id__": 13
+        "__id__": 14
       },
       {
-        "__id__": 15
+        "__id__": 16
       },
       {
-        "__id__": 17
+        "__id__": 18
       },
       {
-        "__id__": 19
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 22
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -261,11 +274,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 12
+      "__id__": 13
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -289,11 +302,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 14
+      "__id__": 15
     },
     "_id": ""
   },
@@ -307,11 +320,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 16
+      "__id__": 17
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -355,11 +368,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 18
+      "__id__": 19
     },
     "playOnLoad": true,
     "_clips": [
@@ -397,11 +410,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 20
+      "__id__": 21
     },
     "hitFlashMaterial": {
       "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
@@ -449,14 +462,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 23
+      "__id__": 24
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 22
+      "__id__": 23
     },
     "asset": {
       "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -464,7 +477,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 24
+      "__id__": 25
     },
     "targetOverrides": null
   },
@@ -478,10 +491,7 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 25
-      },
-      {
-        "__id__": 27
+        "__id__": 26
       },
       {
         "__id__": 28
@@ -496,7 +506,10 @@
         "__id__": 31
       },
       {
-        "__id__": 33
+        "__id__": 32
+      },
+      {
+        "__id__": 34
       }
     ],
     "removedComponents": []
@@ -504,7 +517,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_name"
@@ -520,7 +533,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_lpos"
@@ -535,7 +548,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_lrot"
@@ -551,7 +564,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_euler"
@@ -566,7 +579,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_active"
@@ -576,7 +589,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 32
+      "__id__": 33
     },
     "propertyPath": [
       "_contentSize"
@@ -596,7 +609,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_lscale"
@@ -615,14 +628,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 35
+      "__id__": 36
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 34
+      "__id__": 35
     },
     "asset": {
       "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -630,7 +643,7 @@
     },
     "fileId": "5fqU0L3/FOhKaco5UkHuWT",
     "instance": {
-      "__id__": 36
+      "__id__": 37
     },
     "targetOverrides": null
   },
@@ -644,10 +657,7 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 37
-      },
-      {
-        "__id__": 39
+        "__id__": 38
       },
       {
         "__id__": 40
@@ -659,7 +669,10 @@
         "__id__": 42
       },
       {
-        "__id__": 44
+        "__id__": 43
+      },
+      {
+        "__id__": 45
       }
     ],
     "removedComponents": []
@@ -667,7 +680,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 39
     },
     "propertyPath": [
       "_name"
@@ -683,7 +696,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 39
     },
     "propertyPath": [
       "_lpos"
@@ -698,7 +711,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 39
     },
     "propertyPath": [
       "_lrot"
@@ -714,7 +727,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 39
     },
     "propertyPath": [
       "_euler"
@@ -729,7 +742,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 43
+      "__id__": 44
     },
     "propertyPath": [
       "_lpos"
@@ -750,7 +763,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 39
     },
     "propertyPath": [
       "_lscale"
@@ -772,7 +785,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 47
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -800,10 +813,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 49
     },
     "anm": {
-      "__id__": 13
+      "__id__": 14
     },
     "_id": ""
   },
@@ -821,7 +834,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 51
     },
     "debugMode": false,
     "_id": ""
@@ -840,7 +853,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 52
+      "__id__": 53
     },
     "enabledContactListener": true,
     "bullet": false,
@@ -874,7 +887,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 55
     },
     "tag": 0,
     "_group": 4,
@@ -908,7 +921,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 57
     },
     "playOnLoad": false,
     "_clips": [],
@@ -932,10 +945,10 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 34
+        "__id__": 35
       },
       {
-        "__id__": 22
+        "__id__": 23
       },
       {
         "__id__": 2

assets/resources/game/heros/ha2.prefab

@@ -22,35 +22,35 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 11
       },
       {
-        "__id__": 22
+        "__id__": 23
       },
       {
-        "__id__": 34
+        "__id__": 35
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 46
       },
       {
-        "__id__": 47
+        "__id__": 48
       },
       {
-        "__id__": 49
+        "__id__": 50
       },
       {
-        "__id__": 51
+        "__id__": 52
       },
       {
-        "__id__": 53
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 56
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -127,6 +127,9 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 10
       }
     ],
     "removedComponents": []
@@ -193,6 +196,16 @@
       "z": 0
     }
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_active"
+    ],
+    "value": false
+  },
   {
     "__type__": "cc.Node",
     "_name": "anm",
@@ -205,23 +218,23 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 11
+        "__id__": 12
       },
       {
-        "__id__": 13
+        "__id__": 14
       },
       {
-        "__id__": 15
+        "__id__": 16
       },
       {
-        "__id__": 17
+        "__id__": 18
       },
       {
-        "__id__": 19
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 22
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -258,11 +271,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 12
+      "__id__": 13
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -286,11 +299,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 14
+      "__id__": 15
     },
     "_id": ""
   },
@@ -304,11 +317,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 16
+      "__id__": 17
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -352,11 +365,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 18
+      "__id__": 19
     },
     "hitFlashMaterial": {
       "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
@@ -390,11 +403,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 20
+      "__id__": 21
     },
     "playOnLoad": false,
     "_clips": [
@@ -446,14 +459,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 23
+      "__id__": 24
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 22
+      "__id__": 23
     },
     "asset": {
       "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -461,7 +474,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 24
+      "__id__": 25
     },
     "targetOverrides": null
   },
@@ -475,10 +488,7 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 25
-      },
-      {
-        "__id__": 27
+        "__id__": 26
       },
       {
         "__id__": 28
@@ -493,7 +503,10 @@
         "__id__": 31
       },
       {
-        "__id__": 33
+        "__id__": 32
+      },
+      {
+        "__id__": 34
       }
     ],
     "removedComponents": []
@@ -501,7 +514,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_name"
@@ -517,7 +530,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_lpos"
@@ -532,7 +545,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_lrot"
@@ -548,7 +561,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_euler"
@@ -563,7 +576,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_active"
@@ -573,7 +586,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 32
+      "__id__": 33
     },
     "propertyPath": [
       "_contentSize"
@@ -593,7 +606,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_lscale"
@@ -612,14 +625,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 35
+      "__id__": 36
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 34
+      "__id__": 35
     },
     "asset": {
       "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -627,7 +640,7 @@
     },
     "fileId": "5fqU0L3/FOhKaco5UkHuWT",
     "instance": {
-      "__id__": 36
+      "__id__": 37
     },
     "targetOverrides": null
   },
@@ -641,10 +654,7 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 37
-      },
-      {
-        "__id__": 39
+        "__id__": 38
       },
       {
         "__id__": 40
@@ -656,7 +666,10 @@
         "__id__": 42
       },
       {
-        "__id__": 44
+        "__id__": 43
+      },
+      {
+        "__id__": 45
       }
     ],
     "removedComponents": []
@@ -664,7 +677,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 39
     },
     "propertyPath": [
       "_name"
@@ -680,7 +693,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 39
     },
     "propertyPath": [
       "_lpos"
@@ -695,7 +708,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 39
     },
     "propertyPath": [
       "_lrot"
@@ -711,7 +724,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 39
     },
     "propertyPath": [
       "_euler"
@@ -726,7 +739,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 43
+      "__id__": 44
     },
     "propertyPath": [
       "_lpos"
@@ -747,7 +760,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 39
     },
     "propertyPath": [
       "_lscale"
@@ -769,7 +782,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 47
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -797,10 +810,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 49
     },
     "anm": {
-      "__id__": 13
+      "__id__": 14
     },
     "_id": ""
   },
@@ -818,7 +831,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 51
     },
     "debugMode": false,
     "_id": ""
@@ -837,7 +850,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 52
+      "__id__": 53
     },
     "enabledContactListener": true,
     "bullet": false,
@@ -871,7 +884,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 55
     },
     "tag": 0,
     "_group": 4,
@@ -908,10 +921,10 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 34
+        "__id__": 35
       },
       {
-        "__id__": 22
+        "__id__": 23
       },
       {
         "__id__": 2

assets/resources/game/heros/ha3.prefab

@@ -22,38 +22,38 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 11
       },
       {
-        "__id__": 22
+        "__id__": 23
       },
       {
-        "__id__": 34
+        "__id__": 35
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 46
       },
       {
-        "__id__": 47
+        "__id__": 48
       },
       {
-        "__id__": 49
+        "__id__": 50
       },
       {
-        "__id__": 51
+        "__id__": 52
       },
       {
-        "__id__": 53
+        "__id__": 54
       },
       {
-        "__id__": 55
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 58
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -130,6 +130,9 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 10
       }
     ],
     "removedComponents": []
@@ -196,6 +199,16 @@
       "z": 0
     }
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_active"
+    ],
+    "value": false
+  },
   {
     "__type__": "cc.Node",
     "_name": "anm",
@@ -208,23 +221,23 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 11
+        "__id__": 12
       },
       {
-        "__id__": 13
+        "__id__": 14
       },
       {
-        "__id__": 15
+        "__id__": 16
       },
       {
-        "__id__": 17
+        "__id__": 18
       },
       {
-        "__id__": 19
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 22
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -261,11 +274,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 12
+      "__id__": 13
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -289,11 +302,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 14
+      "__id__": 15
     },
     "_id": ""
   },
@@ -307,11 +320,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 16
+      "__id__": 17
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -355,11 +368,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 18
+      "__id__": 19
     },
     "hitFlashMaterial": {
       "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
@@ -393,11 +406,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 20
+      "__id__": 21
     },
     "playOnLoad": false,
     "_clips": [
@@ -452,14 +465,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 23
+      "__id__": 24
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 22
+      "__id__": 23
     },
     "asset": {
       "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -467,7 +480,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 24
+      "__id__": 25
     },
     "targetOverrides": null
   },
@@ -481,10 +494,7 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 25
-      },
-      {
-        "__id__": 27
+        "__id__": 26
       },
       {
         "__id__": 28
@@ -499,7 +509,10 @@
         "__id__": 31
       },
       {
-        "__id__": 33
+        "__id__": 32
+      },
+      {
+        "__id__": 34
       }
     ],
     "removedComponents": []
@@ -507,7 +520,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_name"
@@ -523,7 +536,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_lpos"
@@ -538,7 +551,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_lrot"
@@ -554,7 +567,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_euler"
@@ -569,7 +582,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_active"
@@ -579,7 +592,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 32
+      "__id__": 33
     },
     "propertyPath": [
       "_contentSize"
@@ -599,7 +612,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 27
     },
     "propertyPath": [
       "_lscale"
@@ -618,14 +631,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 35
+      "__id__": 36
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 34
+      "__id__": 35
     },
     "asset": {
       "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -633,7 +646,7 @@
     },
     "fileId": "5fqU0L3/FOhKaco5UkHuWT",
     "instance": {
-      "__id__": 36
+      "__id__": 37
     },
     "targetOverrides": null
   },
@@ -647,10 +660,7 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 37
-      },
-      {
-        "__id__": 39
+        "__id__": 38
       },
       {
         "__id__": 40
@@ -662,7 +672,10 @@
         "__id__": 42
       },
       {
-        "__id__": 44
+        "__id__": 43
+      },
+      {
+        "__id__": 45
       }
     ],
     "removedComponents": []
@@ -670,7 +683,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 39
     },
     "propertyPath": [
       "_name"
@@ -686,7 +699,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 39
     },
     "propertyPath": [
       "_lpos"
@@ -701,7 +714,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 39
     },
     "propertyPath": [
       "_lrot"
@@ -717,7 +730,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 39
     },
     "propertyPath": [
       "_euler"
@@ -732,7 +745,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 43
+      "__id__": 44
     },
     "propertyPath": [
       "_lpos"
@@ -753,7 +766,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 39
     },
     "propertyPath": [
       "_lscale"
@@ -775,7 +788,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 47
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -803,10 +816,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 49
     },
     "anm": {
-      "__id__": 13
+      "__id__": 14
     },
     "_id": ""
   },
@@ -824,7 +837,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 51
     },
     "debugMode": false,
     "_id": ""
@@ -843,7 +856,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 52
+      "__id__": 53
     },
     "enabledContactListener": true,
     "bullet": false,
@@ -877,7 +890,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 55
     },
     "tag": 0,
     "_group": 4,
@@ -911,7 +924,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 57
     },
     "playOnLoad": false,
     "_clips": [],
@@ -935,10 +948,10 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 34
+        "__id__": 35
       },
       {
-        "__id__": 22
+        "__id__": 23
       },
       {
         "__id__": 2

assets/resources/game/heros/mb1.prefab

@@ -167,7 +167,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 5,
+      "y": 0.034,
       "z": 0
     }
   },
@@ -212,8 +212,8 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 0.25,
-      "y": 0.7,
+      "x": 2,
+      "y": 2,
       "z": 1
     }
   },

assets/resources/game/heros/mb2.prefab

@@ -167,7 +167,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 5,
+      "y": 2.253,
       "z": 0
     }
   },
@@ -212,8 +212,8 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 0.25,
-      "y": 0.7,
+      "x": 2,
+      "y": 2,
       "z": 1
     }
   },

assets/resources/game/heros/mb3.prefab

@@ -167,7 +167,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 5,
+      "y": 1.196,
       "z": 0
     }
   },
@@ -212,8 +212,8 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 0.25,
-      "y": 0.7,
+      "x": 2,
+      "y": 2,
       "z": 1
     }
   },

assets/resources/game/heros/mb4.prefab

@@ -167,7 +167,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 5,
+      "y": 1.196,
       "z": 0
     }
   },
@@ -212,8 +212,8 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 0.25,
-      "y": 0.6,
+      "x": 2,
+      "y": 2,
       "z": 1
     }
   },

assets/resources/game/heros/mb5.prefab

@@ -167,7 +167,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 5,
+      "y": 1.196,
       "z": 0
     }
   },
@@ -212,8 +212,8 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 0.26,
-      "y": 0.7,
+      "x": 2,
+      "y": 2,
       "z": 1
     }
   },

assets/resources/game/heros/mb6.prefab

@@ -167,7 +167,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 5,
+      "y": 2.253,
       "z": 0
     }
   },
@@ -212,8 +212,8 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 0.4,
-      "y": 0.9,
+      "x": 3,
+      "y": 3,
       "z": 1
     }
   },

assets/resources/game/heros/top.prefab

@@ -38,10 +38,13 @@
     "_components": [
       {
         "__id__": 110
+      },
+      {
+        "__id__": 112
       }
     ],
     "_prefab": {
-      "__id__": 112
+      "__id__": 114
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -95,7 +98,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 9.114,
+      "x": 0,
       "y": 10,
       "z": 0
     },
@@ -217,7 +220,7 @@
         "__id__": 17
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 25
@@ -235,7 +238,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -9.738,
+      "y": -7.84,
       "z": 0
     },
     "_lrot": {
@@ -287,7 +290,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -35,
+      "x": -20,
       "y": 0,
       "z": 0
     },
@@ -328,8 +331,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 70,
-      "height": 10
+      "width": 40,
+      "height": 5
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -506,8 +509,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 240,
-      "height": 40
+      "width": 140,
+      "height": 23.333333333333336
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -631,8 +634,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 70,
-      "height": 10
+      "width": 40,
+      "height": 5
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -859,7 +862,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 40,
-      "height": 11
+      "height": 9
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1037,7 +1040,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 140,
-      "height": 43.333333333333336
+      "height": 36.66666666666667
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1162,7 +1165,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 40,
-      "height": 11
+      "height": 9
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1347,7 +1350,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -25,
+      "x": -20,
       "y": 0,
       "z": 0
     },
@@ -1388,8 +1391,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 50,
-      "height": 10
+      "width": 40,
+      "height": 9
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1691,8 +1694,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 50,
-      "height": 10
+      "width": 40,
+      "height": 9
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1813,7 +1816,7 @@
         "__id__": 99
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 105
@@ -2520,8 +2523,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 70,
-      "height": 20
+      "width": 40,
+      "height": 11
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2534,6 +2537,33 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "cdvV5hAkdEaY6AT6urHKuf"
   },
+  {
+    "__type__": "c4181/FEWhKbY0D0PLdCyKi",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 113
+    },
+    "hpProgressBar": {
+      "__id__": 53
+    },
+    "lvLabel": null,
+    "shieldProgressBar": {
+      "__id__": 77
+    },
+    "hpBarSprite": {
+      "__id__": 36
+    },
+    "_id": "a77QVRkP5NX4b+LyqmW1KJ"
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "3eCKBFOJhLHKqcnak/mi3d"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

assets/resources/game/skill/anm/atk/atk01.anim

@@ -7,21 +7,255 @@
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 8,
+    "sample": 24,
     "speed": 1,
-    "wrapMode": 2,
+    "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0,
+    "_duration": 0.125,
     "_hash": 500763545,
-    "_tracks": [],
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
     "_exoticAnimation": null,
-    "_events": [],
+    "_events": [
+      {
+        "frame": 0.08333333333333333,
+        "func": "",
+        "params": []
+      },
+      {
+        "frame": 0.08333333333333333,
+        "func": "atk",
+        "params": []
+      }
+    ],
     "_embeddedPlayers": [],
     "_additiveSettings": {
-      "__id__": 1
+      "__id__": 12
     },
     "_auxiliaryCurveEntries": []
   },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 6
+      },
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 10
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      "scale"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "Node"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.08333333333333333,
+      0.125
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.2999999523162842,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.2999999523162842,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.2999999523162842,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 7
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.08333333333333333,
+      0.125
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.100000023841858,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.100000023841858,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.100000023841858,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 9
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.08333333333333333,
+      0.125
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 11
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
   {
     "__type__": "cc.AnimationClipAdditiveSettings",
     "enabled": false,

assets/resources/game/skill/anm/atk/atk02.anim

@@ -0,0 +1,116 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "atk01",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 24,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 0.20833333333333334,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [
+      {
+        "frame": 0.08333333333333333,
+        "func": "",
+        "params": []
+      },
+      {
+        "frame": 0.08333333333333333,
+        "func": "atk",
+        "params": []
+      }
+    ],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 7
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "Node"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.041666666666666664,
+      0.08333333333333333,
+      0.125,
+      0.16666666666666666
+    ],
+    "_values": [
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@c9de1",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@1ebb0",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@0e5a2",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@360bd",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/skill/anm/atk/atk02.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "6b9c9f74-0168-4b57-824d-bfcc2cd1785d",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "atk02"
+  }
+}

assets/resources/game/skill/anm/atk/atk03.anim

@@ -0,0 +1,116 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "atk01",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 24,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 0.20833333333333334,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [
+      {
+        "frame": 0.08333333333333333,
+        "func": "",
+        "params": []
+      },
+      {
+        "frame": 0.08333333333333333,
+        "func": "atk",
+        "params": []
+      }
+    ],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 7
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "Node"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.041666666666666664,
+      0.08333333333333333,
+      0.125,
+      0.16666666666666666
+    ],
+    "_values": [
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@c9de1",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@1ebb0",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@0e5a2",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@360bd",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/skill/anm/atk/atk03.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "26398731-5541-44ca-b2b7-4947dc9bf7f7",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "atk03"
+  }
+}

assets/resources/game/skill/anm/atk/atk04.anim

@@ -0,0 +1,116 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "atk01",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 24,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 0.20833333333333334,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [
+      {
+        "frame": 0.08333333333333333,
+        "func": "",
+        "params": []
+      },
+      {
+        "frame": 0.08333333333333333,
+        "func": "atk",
+        "params": []
+      }
+    ],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 7
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "Node"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.041666666666666664,
+      0.08333333333333333,
+      0.125,
+      0.16666666666666666
+    ],
+    "_values": [
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@c9de1",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@1ebb0",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@0e5a2",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@360bd",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/skill/anm/atk/atk04.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "0ad94bf2-3b2d-4f80-8500-68c5e33e2ed1",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "atk04"
+  }
+}

assets/resources/game/skill/anm/atk/atk05.anim

@@ -0,0 +1,116 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "atk01",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 24,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 0.20833333333333334,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [
+      {
+        "frame": 0.08333333333333333,
+        "func": "",
+        "params": []
+      },
+      {
+        "frame": 0.08333333333333333,
+        "func": "atk",
+        "params": []
+      }
+    ],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 7
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "Node"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.041666666666666664,
+      0.08333333333333333,
+      0.125,
+      0.16666666666666666
+    ],
+    "_values": [
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@c9de1",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@1ebb0",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@0e5a2",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@360bd",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/skill/anm/atk/atk05.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "ba0a95bf-2ea1-4d27-9c4f-cbd970ca558c",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "atk05"
+  }
+}

assets/resources/game/skill/atk/a1.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.4,
-      "y": 0.4,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,
@@ -250,7 +250,11 @@
     },
     "atk_x": 10,
     "atk_y": 15,
-    "_id": ""
+    "_id": "",
+    "runType": 1,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -336,4 +340,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/a2.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.4,
-      "y": 0.4,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,
@@ -250,7 +250,11 @@
     },
     "atk_x": 10,
     "atk_y": 15,
-    "_id": ""
+    "_id": "",
+    "runType": 1,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -336,4 +340,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/a3.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
-      "y": 0.5,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,
@@ -250,7 +250,11 @@
     },
     "atk_x": 10,
     "atk_y": 15,
-    "_id": ""
+    "_id": "",
+    "runType": 1,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -336,4 +340,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/a4.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.4,
-      "y": 0.4,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,
@@ -250,7 +250,11 @@
     },
     "atk_x": 10,
     "atk_y": 15,
-    "_id": ""
+    "_id": "",
+    "runType": 1,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -336,4 +340,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/a5.prefab

@@ -250,7 +250,11 @@
     },
     "atk_x": 10,
     "atk_y": 15,
-    "_id": ""
+    "_id": "",
+    "runType": 1,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -336,4 +340,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/atk1.prefab

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.Prefab",
-    "_name": "atk",
+    "_name": "atk1",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_native": "",
@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "atk",
+    "_name": "atk1",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": null,
@@ -108,8 +108,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": -0.5,
-      "y": 0.5,
+      "x": 1.3,
+      "y": 1.1,
       "z": 1
     },
     "_mobility": 0,
@@ -136,8 +136,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 139,
-      "height": 128
+      "width": 95,
+      "height": 96
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -186,7 +186,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": {
-      "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6",
+      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20",
       "__expectedType__": "cc.SpriteAtlas"
     },
     "_id": ""
@@ -222,8 +222,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 30,
-      "height": 50
+      "width": 120,
+      "height": 120
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -248,8 +248,13 @@
     "__prefab": {
       "__id__": 11
     },
-    "atk_x": 0,
-    "atk_y": 0,
+    "atk_x": 20,
+    "atk_y": 40,
+    "runType": 2,
+    "endType": 0,
+    "speed": 720,
+    "time": 0,
+    "distance": 100,
     "_id": ""
   },
   {
@@ -315,8 +320,8 @@
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 30,
-      "height": 50
+      "width": 120,
+      "height": 120
     },
     "_id": ""
   },
@@ -336,7 +341,7 @@
     "__prefab": {
       "__id__": 17
     },
-    "playOnLoad": false,
+    "playOnLoad": true,
     "_clips": [
       {
         "__uuid__": "45017156-064b-43f2-a24e-176b6ce17ad8",

assets/resources/game/skill/atk/atk1.prefab.meta

@@ -8,6 +8,6 @@
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "atk"
+    "syncNodeName": "atk1"
   }
 }

assets/resources/game/skill/atk/atk2.prefab

@@ -0,0 +1,375 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "atk2",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "atk2",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Node",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1.3,
+      "y": 1.1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 95,
+      "height": 96
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "93pNmvtQlLSqtTgIepyEmA"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 6
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": {
+      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20",
+      "__expectedType__": "cc.SpriteAtlas"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "12eKc8gltBz50frJCS5+ww"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "3arqAMBz1MvoXBzeDaL5M/",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 9
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 120
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "63NP9yq3hEUKD/OZZZ5t7x"
+  },
+  {
+    "__type__": "57aabs7TE1J5obTAZczc+64",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 11
+    },
+    "atk_x": 20,
+    "atk_y": 40,
+    "runType": 2,
+    "endType": 0,
+    "speed": 720,
+    "time": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "35nW0iQNBH2bqkWAr3MVkQ"
+  },
+  {
+    "__type__": "cc.RigidBody2D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 13
+    },
+    "enabledContactListener": true,
+    "bullet": false,
+    "awakeOnLoad": true,
+    "_group": 1,
+    "_type": 1,
+    "_allowSleep": false,
+    "_gravityScale": 1,
+    "_linearDamping": 0,
+    "_angularDamping": 0,
+    "_linearVelocity": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_angularVelocity": 0,
+    "_fixedRotation": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "57cr7S0YpK4oEZCavwXtIX"
+  },
+  {
+    "__type__": "cc.BoxCollider2D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 15
+    },
+    "tag": 0,
+    "_group": 1,
+    "_density": 1,
+    "_sensor": true,
+    "_friction": 0.2,
+    "_restitution": 0,
+    "_offset": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_size": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 120
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "ebw5mObxNGGKxnJXDgX5gl"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "playOnLoad": true,
+    "_clips": [
+      {
+        "__uuid__": "6b9c9f74-0168-4b57-824d-bfcc2cd1785d",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "6b9c9f74-0168-4b57-824d-bfcc2cd1785d",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "20U0hP/NZErJJXRCEib1lq"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+    "instance": null,
+    "targetOverrides": null
+  }
+]

assets/resources/game/skill/atk/atk2.prefab.meta

@@ -2,12 +2,12 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "93fda804-b794-4119-a287-952a70be15cb",
+  "uuid": "ff6e9a75-b1b9-448e-9cbd-d30de98fd21b",
   "files": [
     ".json"
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "guide1"
+    "syncNodeName": "atk2"
   }
 }

assets/resources/game/skill/atk/atk3.prefab

@@ -0,0 +1,375 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "atk3",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "atk3",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Node",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1.3,
+      "y": 1.1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 95,
+      "height": 96
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "93pNmvtQlLSqtTgIepyEmA"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 6
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": {
+      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20",
+      "__expectedType__": "cc.SpriteAtlas"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "12eKc8gltBz50frJCS5+ww"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "3arqAMBz1MvoXBzeDaL5M/",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 9
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 120
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "63NP9yq3hEUKD/OZZZ5t7x"
+  },
+  {
+    "__type__": "57aabs7TE1J5obTAZczc+64",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 11
+    },
+    "atk_x": 20,
+    "atk_y": 40,
+    "runType": 2,
+    "endType": 0,
+    "speed": 720,
+    "time": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "35nW0iQNBH2bqkWAr3MVkQ"
+  },
+  {
+    "__type__": "cc.RigidBody2D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 13
+    },
+    "enabledContactListener": true,
+    "bullet": false,
+    "awakeOnLoad": true,
+    "_group": 1,
+    "_type": 1,
+    "_allowSleep": false,
+    "_gravityScale": 1,
+    "_linearDamping": 0,
+    "_angularDamping": 0,
+    "_linearVelocity": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_angularVelocity": 0,
+    "_fixedRotation": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "57cr7S0YpK4oEZCavwXtIX"
+  },
+  {
+    "__type__": "cc.BoxCollider2D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 15
+    },
+    "tag": 0,
+    "_group": 1,
+    "_density": 1,
+    "_sensor": true,
+    "_friction": 0.2,
+    "_restitution": 0,
+    "_offset": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_size": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 120
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "ebw5mObxNGGKxnJXDgX5gl"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "playOnLoad": true,
+    "_clips": [
+      {
+        "__uuid__": "26398731-5541-44ca-b2b7-4947dc9bf7f7",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "26398731-5541-44ca-b2b7-4947dc9bf7f7",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "20U0hP/NZErJJXRCEib1lq"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+    "instance": null,
+    "targetOverrides": null
+  }
+]

assets/resources/game/skill/atk/atk3.prefab.meta

@@ -2,12 +2,12 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "26b4ba5a-c5e4-405a-8ce9-27be21f86171",
+  "uuid": "16ca6f33-f910-4202-add4-2862be6c9127",
   "files": [
     ".json"
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "guide2"
+    "syncNodeName": "atk3"
   }
 }

assets/resources/game/skill/atk/atk4.prefab

@@ -0,0 +1,375 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "atk4",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "atk4",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Node",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1.3,
+      "y": 1.1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 95,
+      "height": 96
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "93pNmvtQlLSqtTgIepyEmA"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 6
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": {
+      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20",
+      "__expectedType__": "cc.SpriteAtlas"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "12eKc8gltBz50frJCS5+ww"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "3arqAMBz1MvoXBzeDaL5M/",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 9
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 120
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "63NP9yq3hEUKD/OZZZ5t7x"
+  },
+  {
+    "__type__": "57aabs7TE1J5obTAZczc+64",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 11
+    },
+    "atk_x": 20,
+    "atk_y": 40,
+    "runType": 2,
+    "endType": 0,
+    "speed": 720,
+    "time": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "35nW0iQNBH2bqkWAr3MVkQ"
+  },
+  {
+    "__type__": "cc.RigidBody2D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 13
+    },
+    "enabledContactListener": true,
+    "bullet": false,
+    "awakeOnLoad": true,
+    "_group": 1,
+    "_type": 1,
+    "_allowSleep": false,
+    "_gravityScale": 1,
+    "_linearDamping": 0,
+    "_angularDamping": 0,
+    "_linearVelocity": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_angularVelocity": 0,
+    "_fixedRotation": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "57cr7S0YpK4oEZCavwXtIX"
+  },
+  {
+    "__type__": "cc.BoxCollider2D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 15
+    },
+    "tag": 0,
+    "_group": 1,
+    "_density": 1,
+    "_sensor": true,
+    "_friction": 0.2,
+    "_restitution": 0,
+    "_offset": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_size": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 120
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "ebw5mObxNGGKxnJXDgX5gl"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "playOnLoad": true,
+    "_clips": [
+      {
+        "__uuid__": "0ad94bf2-3b2d-4f80-8500-68c5e33e2ed1",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "0ad94bf2-3b2d-4f80-8500-68c5e33e2ed1",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "20U0hP/NZErJJXRCEib1lq"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+    "instance": null,
+    "targetOverrides": null
+  }
+]

assets/resources/game/skill/atk/atk4.prefab.meta

@@ -2,12 +2,12 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "9864952d-1b4a-4fb8-9e10-05ae52a1befb",
+  "uuid": "7f30cd3c-57d1-476a-96bb-02c4eb082576",
   "files": [
     ".json"
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "guide3"
+    "syncNodeName": "atk4"
   }
 }

assets/resources/game/skill/atk/atk5.prefab

@@ -0,0 +1,375 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "atk5",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "atk5",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Node",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1.3,
+      "y": 1.1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 95,
+      "height": 96
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "93pNmvtQlLSqtTgIepyEmA"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 6
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": {
+      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20",
+      "__expectedType__": "cc.SpriteAtlas"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "12eKc8gltBz50frJCS5+ww"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "3arqAMBz1MvoXBzeDaL5M/",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 9
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 120
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "63NP9yq3hEUKD/OZZZ5t7x"
+  },
+  {
+    "__type__": "57aabs7TE1J5obTAZczc+64",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 11
+    },
+    "atk_x": 20,
+    "atk_y": 40,
+    "runType": 2,
+    "endType": 0,
+    "speed": 720,
+    "time": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "35nW0iQNBH2bqkWAr3MVkQ"
+  },
+  {
+    "__type__": "cc.RigidBody2D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 13
+    },
+    "enabledContactListener": true,
+    "bullet": false,
+    "awakeOnLoad": true,
+    "_group": 1,
+    "_type": 1,
+    "_allowSleep": false,
+    "_gravityScale": 1,
+    "_linearDamping": 0,
+    "_angularDamping": 0,
+    "_linearVelocity": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_angularVelocity": 0,
+    "_fixedRotation": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "57cr7S0YpK4oEZCavwXtIX"
+  },
+  {
+    "__type__": "cc.BoxCollider2D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 15
+    },
+    "tag": 0,
+    "_group": 1,
+    "_density": 1,
+    "_sensor": true,
+    "_friction": 0.2,
+    "_restitution": 0,
+    "_offset": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_size": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 120
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "ebw5mObxNGGKxnJXDgX5gl"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "playOnLoad": true,
+    "_clips": [
+      {
+        "__uuid__": "ba0a95bf-2ea1-4d27-9c4f-cbd970ca558c",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "ba0a95bf-2ea1-4d27-9c4f-cbd970ca558c",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "20U0hP/NZErJJXRCEib1lq"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+    "instance": null,
+    "targetOverrides": null
+  }
+]

assets/resources/game/skill/atk/atk5.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "7227b42b-9cc7-41bd-8858-9d05c4cc758b",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "atk5"
+  }
+}

assets/resources/game/skill/atk/aw1.prefab

@@ -108,8 +108,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.9,
-      "y": 0.9,
+      "x": 0.5,
+      "y": 0.5,
       "z": 1
     },
     "_mobility": 0,
@@ -282,7 +282,11 @@
     },
     "atk_x": 10,
     "atk_y": 25,
-    "_id": ""
+    "_id": "",
+    "runType": 1,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -368,4 +372,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/aw2.prefab

@@ -108,8 +108,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.9,
-      "y": 0.9,
+      "x": 0.5,
+      "y": 0.5,
       "z": 1
     },
     "_mobility": 0,
@@ -282,7 +282,11 @@
     },
     "atk_x": 10,
     "atk_y": 25,
-    "_id": ""
+    "_id": "",
+    "runType": 1,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -368,4 +372,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/aw3.prefab

@@ -108,8 +108,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.8,
-      "y": 0.8,
+      "x": 0.5,
+      "y": 0.5,
       "z": 1
     },
     "_mobility": 0,
@@ -282,7 +282,11 @@
     },
     "atk_x": 10,
     "atk_y": 25,
-    "_id": ""
+    "_id": "",
+    "runType": 1,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -368,4 +372,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/b1.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
-      "y": 0.5,
+      "x": 0.35,
+      "y": 0.35,
       "z": 1
     },
     "_mobility": 0,
@@ -250,7 +250,11 @@
     },
     "atk_x": 10,
     "atk_y": 15,
-    "_id": ""
+    "_id": "",
+    "runType": 1,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -336,4 +340,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/b2.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
-      "y": 0.5,
+      "x": 0.35,
+      "y": 0.35,
       "z": 1
     },
     "_mobility": 0,
@@ -250,7 +250,11 @@
     },
     "atk_x": 10,
     "atk_y": 15,
-    "_id": ""
+    "_id": "",
+    "runType": 1,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -336,4 +340,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/b3.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
-      "y": 0.5,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,

assets/resources/game/skill/atk/f2.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
-      "y": 0.5,
+      "x": 0.4,
+      "y": 0.4,
       "z": 1
     },
     "_mobility": 0,

assets/resources/game/skill/atk/f3.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
-      "y": 0.5,
+      "x": 0.4,
+      "y": 0.4,
       "z": 1
     },
     "_mobility": 0,

assets/resources/game/skill/atk/f4.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
-      "y": 0.5,
+      "x": 0.4,
+      "y": 0.4,
       "z": 1
     },
     "_mobility": 0,

assets/resources/game/skill/atk/fb-1.prefab

@@ -253,7 +253,11 @@
     },
     "atk_x": 0,
     "atk_y": 0,
-    "_id": ""
+    "_id": "",
+    "runType": 1,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -368,4 +372,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/fb-2.prefab

@@ -389,7 +389,11 @@
     },
     "atk_x": 0,
     "atk_y": 0,
-    "_id": ""
+    "_id": "",
+    "runType": 0,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -504,4 +508,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/h1.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
-      "y": 0.5,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,
@@ -250,7 +250,11 @@
     },
     "atk_x": 10,
     "atk_y": 15,
-    "_id": ""
+    "_id": "",
+    "runType": 1,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -336,4 +340,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/h2.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.4,
-      "y": 0.4,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,
@@ -250,7 +250,11 @@
     },
     "atk_x": 10,
     "atk_y": 15,
-    "_id": ""
+    "_id": "",
+    "runType": 1,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -336,4 +340,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/h3.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
-      "y": 0.5,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,

assets/resources/game/skill/atk/h4.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
-      "y": 0.5,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,

assets/resources/game/skill/atk/h5.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
-      "y": 0.5,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,

assets/resources/game/skill/atk/m1.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.4,
-      "y": 0.4,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,
@@ -250,7 +250,11 @@
     },
     "atk_x": 10,
     "atk_y": 15,
-    "_id": ""
+    "_id": "",
+    "runType": 1,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -336,4 +340,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/m2.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.4,
-      "y": 0.4,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,
@@ -250,7 +250,11 @@
     },
     "atk_x": 10,
     "atk_y": 15,
-    "_id": ""
+    "_id": "",
+    "runType": 1,
+    "endType": 2,
+    "speed": 720,
+    "time": 0
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -336,4 +340,4 @@
     "instance": null,
     "targetOverrides": null
   }
-]
+]

assets/resources/game/skill/atk/m3.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
-      "y": 0.5,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,

assets/resources/game/skill/atk/m4.prefab

@@ -105,8 +105,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
-      "y": 0.5,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,

assets/resources/gui/anim/lz.anim

@@ -0,0 +1,499 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "lz",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 12,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 1,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      },
+      {
+        "__id__": 12
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 23
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 6
+      },
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 10
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      "eulerAngles"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "Effect_Light_01_128"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.75,
+      1
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 7
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.75,
+      1
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 9
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.75,
+      1
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -270,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -360,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 11
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 13
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 17
+      },
+      {
+        "__id__": 19
+      },
+      {
+        "__id__": 21
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 14
+      },
+      "scale"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "Effect_Light_01_128"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 16
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.5,
+      1
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.2000000476837158,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.600000023841858,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.2000000476837158,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 18
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.5,
+      1
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.2000000476837158,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.600000023841858,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.2000000476837158,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 20
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.5,
+      1
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 22
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/gui/anim/lz.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "b6d7f5eb-f838-4a4a-abda-6d7e57f71f23",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "lz"
+  }
+}

assets/resources/gui/anim/sh.anim

@@ -0,0 +1,488 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "sh",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 20,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 0.7,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      },
+      {
+        "__id__": 11
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 21
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      "scale"
+    ]
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 4
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.5,
+      0.7
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.5,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 2,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.5,
+      0.7
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.5,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 2,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 8
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.5,
+      0.7
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 10
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 12
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 17
+      },
+      {
+        "__id__": 19
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      "position"
+    ]
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 14
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.1,
+      0.35,
+      0.7
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 16
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.1,
+      0.35,
+      0.7
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -120.52200317382812,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -83.62200164794922,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 120.521999,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -210.52200317382812,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 18
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.1,
+      0.35,
+      0.7
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 20
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/gui/anim/sh.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "9edeec59-f440-479e-9575-8ab6d8208fcd",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "sh"
+  }
+}

assets/resources/gui/auie/hbg.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "57e33de6-9b39-4744-90ac-987944a47da8",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "hbg"
+  }
+}

assets/resources/gui/auie/ibg.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "4531b8e0-a6ec-4944-a249-c2f58712da2e",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "ibg"
+  }
+}

assets/resources/gui/auie/more.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "1bc6274e-7a88-46ee-9965-7b3bb2ac13c4",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "more"
+  }
+}

assets/resources/gui/auie/sbg.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "01fd7d5b-caf6-4206-ae7f-788b8c987888",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "sbg"
+  }
+}

assets/resources/gui/element/barbtn.prefab

@@ -28,14 +28,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 30
       },
       {
-        "__id__": 44
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 35
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -77,9 +77,6 @@
     "_children": [
       {
         "__id__": 3
-      },
-      {
-        "__id__": 9
       }
     ],
     "_active": true,
@@ -134,18 +131,22 @@
     "_parent": {
       "__id__": 2
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 4
+      }
+    ],
     "_active": true,
     "_components": [
       {
-        "__id__": 4
+        "__id__": 10
       },
       {
-        "__id__": 6
+        "__id__": 12
       }
     ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 14
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -176,117 +177,31 @@
     },
     "_id": ""
   },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 3
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 5
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 106,
-      "height": 96
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "bdIoXh/hdNirkf1KcWeGiB"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 3
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 7
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@24ff5",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "efGswFY3FAVL1sj4VKXGeV"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "86S3E4+VBNF5Q4sYq5WENB",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
   {
     "__type__": "cc.Node",
     "_name": "Label",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 10
+        "__id__": 5
       },
       {
-        "__id__": 12
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 9
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -28.541,
+      "y": -47.568333333333385,
       "z": 0
     },
     "_lrot": {
@@ -298,9 +213,9 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
+      "x": 1.6666666666666665,
+      "y": 1.6666666666666665,
+      "z": 0.9999999999999999
     },
     "_mobility": 0,
     "_layer": 1073741824,
@@ -318,11 +233,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 9
+      "__id__": 4
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 11
+      "__id__": 6
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -346,11 +261,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 9
+      "__id__": 4
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 13
+      "__id__": 8
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -421,6 +336,92 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 11
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 106,
+      "height": 96
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "bdIoXh/hdNirkf1KcWeGiB"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 13
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@24ff5",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "efGswFY3FAVL1sj4VKXGeV"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "86S3E4+VBNF5Q4sYq5WENB",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -435,8 +436,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 240,
-      "height": 110
+      "width": 100,
+      "height": 100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -472,7 +473,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@65cbe",
+      "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@62d7f",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -487,7 +488,10 @@
     "_fillRange": 0,
     "_isTrimmedMode": true,
     "_useGrayscale": false,
-    "_atlas": null,
+    "_atlas": {
+      "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73",
+      "__expectedType__": "cc.SpriteAtlas"
+    },
     "_id": ""
   },
   {
@@ -508,10 +512,10 @@
     },
     "_alignFlags": 45,
     "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
+    "_left": 70,
+    "_right": 70,
+    "_top": 5,
+    "_bottom": 5,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -551,219 +555,26 @@
     "_parent": {
       "__id__": 1
     },
-    "_children": [
+    "_children": [],
+    "_active": true,
+    "_components": [
       {
         "__id__": 23
       },
       {
-        "__id__": 29
-      }
-    ],
-    "_active": false,
-    "_components": [
-      {
-        "__id__": 35
+        "__id__": 25
       },
       {
-        "__id__": 37
-      },
-      {
-        "__id__": 39
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 29
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "icon",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 22
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 24
-      },
-      {
-        "__id__": 26
-      }
-    ],
-    "_prefab": {
-      "__id__": 28
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 15,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 0.6,
-      "y": 0.6,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 23
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 25
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 106,
-      "height": 96
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "6eBP1g6s5Goai//DXwnDla"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 23
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 27
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@24ff5",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "caZzAfi9ZLqZS4Wd5Rqm3r"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "ce9MKPS+FJx4Y+XyFAZSyN",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "Label",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 22
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 30
-      },
-      {
-        "__id__": 32
-      }
-    ],
-    "_prefab": {
-      "__id__": 34
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -30,
+      "y": 55,
       "z": 0
     },
     "_lrot": {
@@ -789,115 +600,6 @@
     },
     "_id": ""
   },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 29
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 31
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 64,
-      "height": 54.4
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "fb/sGndAVJK7moJI1+G/0t"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 29
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 33
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_string": "挑战",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 30,
-    "_fontSize": 30,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": true,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": true,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_shadowOffset": {
-      "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
-    },
-    "_shadowBlur": 2,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a9bThvxy9LiriOUrI/zZUU"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "b8MZ0xfLVCQ7mTzo5vkCgp",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -908,12 +610,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 24
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 180,
-      "height": 110
+      "width": 100,
+      "height": 100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -936,7 +638,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 38
+      "__id__": 26
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -948,10 +650,7 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
-      "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@7eac7",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_spriteFrame": null,
     "_type": 1,
     "_fillType": 0,
     "_sizeMode": 0,
@@ -981,14 +680,14 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 28
     },
     "_alignFlags": 45,
     "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
+    "_left": 70,
+    "_right": 70,
+    "_top": 5,
+    "_bottom": 5,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -1030,7 +729,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 31
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1058,11 +757,11 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 33
     },
     "clickEvents": [
       {
-        "__id__": 46
+        "__id__": 34
       }
     ],
     "_interactable": true,
@@ -1125,6 +824,7 @@
       "__id__": 0
     },
     "fileId": "cfWG6+EKVJ3IlHCuz5Pa35",
+    "instance": null,
     "targetOverrides": null
   }
 ]

assets/resources/gui/element/cardbg.prefab

@@ -420,7 +420,7 @@
       "r": 255,
       "g": 255,
       "b": 255,
-      "a": 120
+      "a": 255
     },
     "_spriteFrame": {
       "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@6c895",
@@ -615,8 +615,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 280,
-      "height": 280
+      "width": 300,
+      "height": 300
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -737,8 +737,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 140,
-      "height": 140
+      "width": 150,
+      "height": 150
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -765,9 +765,9 @@
     },
     "_alignFlags": 41,
     "_target": null,
-    "_left": 15,
-    "_right": 15,
-    "_top": 15,
+    "_left": 10,
+    "_right": 10,
+    "_top": 10,
     "_bottom": 115,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
@@ -938,7 +938,7 @@
         "__id__": 57
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 71
@@ -1258,7 +1258,7 @@
       "r": 255,
       "g": 255,
       "b": 255,
-      "a": 120
+      "a": 255
     },
     "_spriteFrame": {
       "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@6c895",
@@ -1453,8 +1453,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 280,
-      "height": 280
+      "width": 300,
+      "height": 300
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1575,8 +1575,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 140,
-      "height": 140
+      "width": 150,
+      "height": 150
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1603,9 +1603,9 @@
     },
     "_alignFlags": 41,
     "_target": null,
-    "_left": 15,
-    "_right": 15,
-    "_top": 15,
+    "_left": 10,
+    "_right": 10,
+    "_top": 10,
     "_bottom": 115,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
@@ -1776,7 +1776,7 @@
         "__id__": 95
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 109
@@ -2096,7 +2096,7 @@
       "r": 255,
       "g": 255,
       "b": 255,
-      "a": 120
+      "a": 255
     },
     "_spriteFrame": {
       "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@6c895",
@@ -2291,8 +2291,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 280,
-      "height": 280
+      "width": 300,
+      "height": 300
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2413,8 +2413,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 140,
-      "height": 140
+      "width": 150,
+      "height": 150
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2441,9 +2441,9 @@
     },
     "_alignFlags": 41,
     "_target": null,
-    "_left": 15,
-    "_right": 15,
-    "_top": 15,
+    "_left": 10,
+    "_right": 10,
+    "_top": 10,
     "_bottom": 115,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
@@ -2614,7 +2614,7 @@
         "__id__": 133
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 147
@@ -2934,7 +2934,7 @@
       "r": 255,
       "g": 255,
       "b": 255,
-      "a": 120
+      "a": 255
     },
     "_spriteFrame": {
       "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@6c895",
@@ -3129,8 +3129,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 280,
-      "height": 280
+      "width": 300,
+      "height": 300
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3251,8 +3251,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 140,
-      "height": 140
+      "width": 150,
+      "height": 150
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3279,9 +3279,9 @@
     },
     "_alignFlags": 41,
     "_target": null,
-    "_left": 15,
-    "_right": 15,
-    "_top": 15,
+    "_left": 10,
+    "_right": 10,
+    "_top": 10,
     "_bottom": 115,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
@@ -3452,7 +3452,7 @@
         "__id__": 171
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 185
@@ -3772,7 +3772,7 @@
       "r": 255,
       "g": 255,
       "b": 255,
-      "a": 120
+      "a": 255
     },
     "_spriteFrame": {
       "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@6c895",
@@ -3967,8 +3967,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 280,
-      "height": 280
+      "width": 300,
+      "height": 300
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4089,8 +4089,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 140,
-      "height": 140
+      "width": 150,
+      "height": 150
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4117,9 +4117,9 @@
     },
     "_alignFlags": 41,
     "_target": null,
-    "_left": 15,
-    "_right": 15,
-    "_top": 15,
+    "_left": 10,
+    "_right": 10,
+    "_top": 10,
     "_bottom": 115,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,

assets/resources/gui/element/guide4.prefab.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "1.1.50",
-  "importer": "prefab",
-  "imported": true,
-  "uuid": "d2dcd02d-b49b-45ea-8e20-1cc474837da9",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {
-    "syncNodeName": "guide4"
-  }
-}