5.24BuYu

Files

T

wz1531 2fd8747949 Merge branch 'Art01' into feature/newWork

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt

2026-04-22 16:32:00 +08:00

1_5.24_fishing

…

AddressableAssetsData

…

Art

Merge branch 'Art01' into feature/newWork

2026-04-22 16:32:00 +08:00

bundles

…

dataresources

…

Editor

…

fishResources

…

Framework

鲁班配置表

2026-04-22 16:22:28 +08:00

GG Camera Shake

…

MyGame

Merge branch 'Art01' into feature/newWork

2026-04-22 16:32:00 +08:00

Plugins

…

Resources

…

ResScenes

…

Samples

…

Scenes

…

Scripts

Merge branch 'Art01' into feature/newWork

2026-04-22 16:32:00 +08:00

Settings

…

Spine

…

Temp

…

TextMesh Pro

…

Texture2D

…

TutorialInfo

…

UIResources

…

1_5.24_fishing.meta

…

AddressableAssetsData.meta

…

Art.meta

…

bundles.meta

…

dataresources.meta

…

DefaultVolumeProfile.asset

…

DefaultVolumeProfile.asset.meta

…

DownAddress.cs

…

DownAddress.cs.meta

…

Editor.meta

…

fishResources.meta

…

Framework.meta

…

GG Camera Shake.meta

…

idle_event_Fish.cs

…

idle_event_Fish.cs.meta

…

link.xml

…

link.xml.meta

…

MyGame.meta

…

New Material.mat

…

New Material.mat.meta

…

player_name_chars.txt

…

player_name_chars.txt.meta

…

Plugins.meta

…

Readme.asset

…

Readme.asset.meta

…

Resources.meta

…

ResScenes.meta

…

Samples.meta

…

Scenes.meta

…

Scripts.meta

…

Settings.meta

…

Shoved Reaction With Spin.fbx

…

Shoved Reaction With Spin.fbx.meta

…

Spine.meta

…

Temp.meta

…

Temp.unity

…

Temp.unity.meta

…

TextMesh Pro.meta

…

Texture2D.meta

…

TutorialInfo.meta

…

UIResources.meta

…

UniversalRenderPipelineGlobalSettings.asset

…

UniversalRenderPipelineGlobalSettings.asset.meta

…

Readme.asset.meta

fileFormatVersion: 2
guid: 8105016687592461f977c054a80ce2f2
NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: