czbdw c8d1c21e11 Merge branch 'master' into master_mapDev ...

# Conflicts:
#	Assets/GameRes/AlwaysRes/FontResource/Fonts & Materials/ChillOrganic_Medium SDF.asset
#	Assets/GameRes/AlwaysRes/FontResource/Fonts & Materials/SourceHanSansCN-Medium SDF.asset
#	Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat

2024-10-27 17:17:52 +08:00

..

3rd

init

2024-10-16 00:03:41 +08:00

Art

Merge branch 'master' into master_mapDev

2024-10-27 17:17:52 +08:00

AstarPathfindingProject

updated

2024-10-27 16:01:07 +08:00

EasyTouchBundle

增加特效 ，优化道具外观

2024-10-27 17:06:07 +08:00

Editor

update urp

2024-10-23 23:16:50 +08:00

GameRes

Merge branch 'master' into master_mapDev

2024-10-27 17:17:52 +08:00

Plugins

update core

2024-10-24 22:45:29 +08:00

Resources

update core

2024-10-25 15:35:39 +08:00

Scripts

增加特效 ，优化道具外观

2024-10-27 17:14:19 +08:00

Sources

增加开场cg

2024-10-24 18:20:24 +08:00

StreamingAssets

update core

2024-10-24 22:45:29 +08:00

TextMesh Pro

init

2024-10-16 00:03:41 +08:00

UI Toolkit

update urp

2024-10-23 23:16:50 +08:00

3rd.meta

init

2024-10-16 00:03:41 +08:00

Art.meta

init

2024-10-16 00:03:41 +08:00

AssetBundleCollectorSetting.asset

init

2024-10-16 00:03:41 +08:00

AssetBundleCollectorSetting.asset.meta

init

2024-10-16 00:03:41 +08:00

AstarPathfindingProject.meta

init

2024-10-16 00:03:41 +08:00

EasyTouchBundle.meta

init

2024-10-16 00:03:41 +08:00

Editor.meta

init

2024-10-16 00:03:41 +08:00

GameRes.meta

init

2024-10-16 00:03:41 +08:00

IceCreamGlobalSettings.asset

init

2024-10-16 00:03:41 +08:00

IceCreamGlobalSettings.asset.meta

init

2024-10-16 00:03:41 +08:00

img_3_ditai.png

updated

2024-10-27 16:01:07 +08:00

img_3_ditai.png.meta

updated

2024-10-27 16:01:07 +08:00

img_3_piant1.png

updated

2024-10-27 16:01:07 +08:00

img_3_piant1.png.meta

updated

2024-10-27 16:01:07 +08:00

img_3_piant2.png

updated

2024-10-27 16:01:07 +08:00

img_3_piant2.png.meta

updated

2024-10-27 16:01:07 +08:00

img_3_piant3.png

updated

2024-10-27 16:01:07 +08:00

img_3_piant3.png.meta

updated

2024-10-27 16:01:07 +08:00

img_3_piant4.png

updated

2024-10-27 16:01:07 +08:00

img_3_piant4.png.meta

updated

2024-10-27 16:01:07 +08:00

img_3_piant5.png

updated

2024-10-27 16:01:07 +08:00

img_3_piant5.png.meta

updated

2024-10-27 16:01:07 +08:00

img_3_piant6.png

updated

2024-10-27 16:01:07 +08:00

img_3_piant6.png.meta

updated

2024-10-27 16:01:07 +08:00

img_3_shibei.png

updated

2024-10-27 16:01:07 +08:00

img_3_shibei.png.meta

updated

2024-10-27 16:01:07 +08:00

MyShaderVariants.json

init

2024-10-16 00:03:41 +08:00

MyShaderVariants.json.meta

init

2024-10-16 00:03:41 +08:00

MyShaderVariants.shadervariants

init

2024-10-16 00:03:41 +08:00

MyShaderVariants.shadervariants.meta

init

2024-10-16 00:03:41 +08:00

Plugins.meta

init

2024-10-16 00:03:41 +08:00

Resources.meta

init

2024-10-16 00:03:41 +08:00

Scripts.meta

init

2024-10-16 00:03:41 +08:00

Sources.meta

init

2024-10-16 00:03:41 +08:00

StreamingAssets.meta

init

2024-10-16 00:03:41 +08:00

Test.meta

init

2024-10-16 00:03:41 +08:00

TextMesh Pro.meta

init

2024-10-16 00:03:41 +08:00

UI Toolkit.meta

init

2024-10-16 00:03:41 +08:00

UnityDefaultRuntimeTheme.tss

init

2024-10-16 00:03:41 +08:00

UnityDefaultRuntimeTheme.tss.meta

init

2024-10-16 00:03:41 +08:00

Universal Render Pipeline Asset_Renderer.asset

update core

2024-10-25 15:35:39 +08:00

Universal Render Pipeline Asset_Renderer.asset.meta

init

2024-10-16 00:03:41 +08:00

Universal Render Pipeline Asset_RendererUGUI.asset

init

2024-10-16 00:03:41 +08:00

Universal Render Pipeline Asset_RendererUGUI.asset.meta

init

2024-10-16 00:03:41 +08:00

Universal Render Pipeline Asset.asset

init

2024-10-16 00:03:41 +08:00

Universal Render Pipeline Asset.asset.meta

init

2024-10-16 00:03:41 +08:00

UniversalRenderPipelineGlobalSettings.asset

init

2024-10-16 00:03:41 +08:00

UniversalRenderPipelineGlobalSettings.asset.meta

init

2024-10-16 00:03:41 +08:00