puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev

Browse Source
This commit is contained in:
xiekaidong 2023-06-20 21:03:48 +08:00
commit 5f8409ad58
7 changed files with 72 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/arts/fonts/tmpfonts/default/tmpfont/font_default.ttf.meta
View File

@ -9,7 +9,7 @@ TrueTypeFontImporter:
characterPadding: 1
includeFontData: 1
fontNames:
- Source Han Sans K
- Source Han Sans SC
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0

34
Assets/arts/fonts/tmpfonts/default/tmpfont/font_sdf.asset
View File

@ -41,18 +41,44 @@ MonoBehaviour:
m_StrikethroughOffset: 6.8
m_StrikethroughThickness: 2.03125
m_TabWidth: 10
m_GlyphTable: []
m_CharacterTable: []
m_GlyphTable:
- m_Index: 17
m_Metrics:
m_Width: 16.03125
m_Height: 24.578125
m_HorizontalBearingX: 1.40625
m_HorizontalBearingY: 24.125
m_HorizontalAdvance: 18.84375
m_GlyphRect:
m_X: 5
m_Y: 5
m_Width: 17
m_Height: 26
m_Scale: 1
m_AtlasIndex: 0
m_CharacterTable:
- m_ElementType: 1
m_Unicode: 48
m_GlyphIndex: 17
m_Scale: 1
m_AtlasTextures:
- {fileID: 2800000, guid: b2be439f29024b44cb2a914e358192c4, type: 2}
m_AtlasTextureIndex: 0
m_IsMultiAtlasTexturesEnabled: 1
m_ClearDynamicDataOnBuild: 0
m_UsedGlyphRects: []
m_FreeGlyphRects:
m_UsedGlyphRects:
- m_X: 0
m_Y: 0
m_Width: 26
m_Height: 35
m_FreeGlyphRects:
- m_X: 0
m_Y: 35
m_Width: 2047
m_Height: 2012
- m_X: 26
m_Y: 0
m_Width: 2021
m_Height: 2047
m_fontInfo:
Name:

2
Assets/arts/fonts/tmpfonts/default/tmpfont/font_sdf_atlas.asset
View File

File diff suppressed because one or more lines are too long

20
Assets/prefabs/effects/battle/sfx_p0026_b01.prefab
View File

@ -26,7 +26,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 789881212169551437}
m_LocalRotation: {x: -0, y: -0, z: 0.70048654, w: 0.7136656}
m_LocalPosition: {x: 247, y: 110, z: 0}
m_LocalPosition: {x: 112, y: 110, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5974839999966414751}
@ -4872,7 +4872,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 4
m_SortMode: 0
m_MinParticleSize: 0
@ -4974,7 +4974,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5122083497519585944}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 74, z: -0.0001373291}
m_LocalPosition: {x: 173.99998, y: 74, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5974839999966414751}
@ -9838,7 +9838,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -9890,7 +9890,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5122083499032849208}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 74, z: -0.0001373291}
m_LocalPosition: {x: 174, y: 74, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5974839999966414751}
@ -14727,7 +14727,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -14779,7 +14779,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5122083499134668298}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 73.99999, z: -0.0001373291}
m_LocalPosition: {x: 174, y: 73.99999, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5974839999966414751}
@ -19616,7 +19616,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -24477,7 +24477,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7135811676220293517}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 73.99999, z: -0.0001373291}
m_LocalPosition: {x: 174, y: 73.99999, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5974839999966414751}
@ -29305,7 +29305,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 1
m_SortMode: 0
m_MinParticleSize: 0

20
Assets/prefabs/effects/battle/sfx_p0026_b02.prefab
View File

@ -26,7 +26,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1153885252015997569}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 73.99999, z: -0.0001373291}
m_LocalPosition: {x: 151, y: 73.99999, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2445163495902200979}
@ -4854,7 +4854,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 1
m_SortMode: 0
m_MinParticleSize: 0
@ -9715,7 +9715,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3751878515000347910}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 73.99999, z: -0.0001373291}
m_LocalPosition: {x: 151.00002, y: 73.99999, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2445163495902200979}
@ -14552,7 +14552,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -14604,7 +14604,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3751878515041364020}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 74, z: -0.0001373291}
m_LocalPosition: {x: 151.00002, y: 74, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2445163495902200979}
@ -19441,7 +19441,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -19493,7 +19493,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3751878516614912404}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 74, z: -0.0001373291}
m_LocalPosition: {x: 151.00002, y: 74, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2445163495902200979}
@ -24357,7 +24357,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -24459,7 +24459,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8787132738874719553}
m_LocalRotation: {x: -0, y: -0, z: 0.70048654, w: 0.7136656}
m_LocalPosition: {x: 247, y: 110, z: 0}
m_LocalPosition: {x: 89.000015, y: 110, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2445163495902200979}
@ -29305,7 +29305,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 4
m_SortMode: 0
m_MinParticleSize: 0

20
Assets/prefabs/effects/battle/sfx_p0026_b03.prefab
View File

@ -4835,7 +4835,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2013516112624975344}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 74, z: -0.0001373291}
m_LocalPosition: {x: 156, y: 74, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1012989561073848663}
@ -9672,7 +9672,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -9724,7 +9724,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2013516113068464322}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 73.99999, z: -0.0001373291}
m_LocalPosition: {x: 156, y: 73.99999, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1012989561073848663}
@ -14561,7 +14561,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -14613,7 +14613,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2013516114675158096}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 74, z: -0.0001373291}
m_LocalPosition: {x: 156, y: 74, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1012989561073848663}
@ -19477,7 +19477,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -19529,7 +19529,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4603601416769328965}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 73.99999, z: -0.0001373291}
m_LocalPosition: {x: 156, y: 73.99999, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1012989561073848663}
@ -24357,7 +24357,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 1
m_SortMode: 0
m_MinParticleSize: 0
@ -24409,7 +24409,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6202020969979684997}
m_LocalRotation: {x: -0.70506096, y: 0.7091468, z: -0, w: 0}
m_LocalPosition: {x: 228, y: 23, z: 0}
m_LocalPosition: {x: 75, y: 23, z: 0}
m_LocalScale: {x: 1, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 1012989561073848663}
@ -29255,7 +29255,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 4
m_SortMode: 0
m_MinParticleSize: 0

20
Assets/prefabs/effects/battle/sfx_p0026_b04.prefab
View File

@ -26,7 +26,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 397768348861824429}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 74, z: -0.0001373291}
m_LocalPosition: {x: 166, y: 74, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1187409524127817898}
@ -4890,7 +4890,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -4942,7 +4942,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 397768349367979021}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 74, z: -0.0001373291}
m_LocalPosition: {x: 166, y: 74, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1187409524127817898}
@ -9779,7 +9779,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -9831,7 +9831,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 397768349394217279}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 73.99999, z: -0.0001373291}
m_LocalPosition: {x: 166, y: 73.99999, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1187409524127817898}
@ -14668,7 +14668,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -19529,7 +19529,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2420435282285618872}
m_LocalRotation: {x: -0, y: -0, z: 0.8973749, w: 0.44126895}
m_LocalPosition: {x: 309, y: 73.99999, z: -0.0001373291}
m_LocalPosition: {x: 166, y: 73.99999, z: -0.0001373291}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1187409524127817898}
@ -24357,7 +24357,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 1
m_SortMode: 0
m_MinParticleSize: 0
@ -24409,7 +24409,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5216957540895037816}
m_LocalRotation: {x: -0.70506096, y: 0.7091468, z: -0, w: 0}
m_LocalPosition: {x: 220, y: 40, z: 0}
m_LocalPosition: {x: 77, y: 40, z: 0}
m_LocalScale: {x: 1, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 1187409524127817898}
@ -29255,7 +29255,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 0
m_RenderMode: 4
m_SortMode: 0
m_MinParticleSize: 0