cda0c4a34f
# Conflicts: # Blacksmith/Assets/Pack/Icon/changbinglei.png.meta # Blacksmith/Assets/Pack/Icon/feibiaolei.png.meta # Blacksmith/Assets/Pack/Icon/gonglei.png.meta # Blacksmith/Assets/Pack/Icon/jianlei.png.meta # Blacksmith/Assets/Pack/Icon/nujianlei.png.meta # Blacksmith/Assets/Pack/Icon/qingjialei.png.meta # Blacksmith/Assets/Pack/Icon/zhanglei.png.meta # Blacksmith/Assets/Pack/Icon/zhongjialei.png.meta # Blacksmith/Assets/Resources/Prefab/player/player.prefab # Blacksmith/Assets/Scenes/SampleScene.unity # Blacksmith/Assets/Script/Battle/BattleManager.cs # Blacksmith/Assets/Script/Battle/Player/PlayerItem.cs # Blacksmith/Assets/Script/DataManager.cs # Blacksmith/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset # Blacksmith/UserSettings/Layouts/default-2022.dwlt # box1/UserSettings/Layouts/default-2022.dwlt # box1/project.config.json