foldcc/taptap2024_GJ_chidouren
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master_mapDev

Browse Source
This commit is contained in:
czbdw
2024-10-25 18:36:35 +08:00
parent a63f29d42c 524c3afbc6
commit 26e38348ab
12 changed files with 500 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
Assets/GameRes/AlwaysRes/FontResource/Fonts & Materials/SourceHanSansCN-Medium SDF.asset
View File

File diff suppressed because one or more lines are too long

95
Assets/GameRes/AlwaysRes/HomeScene.prefab
View File

@@ -3372,7 +3372,6 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5894730123257792291}
- {fileID: 6926850498603954599}
- {fileID: 2184805088862847279}
- {fileID: 7913198350365602262}
- {fileID: 5748299821972806540}
@@ -12322,96 +12321,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
m_PrefabInstance: {fileID: 4815206810372133098}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5244615652379338185
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2558686753146435160}
m_Modifications:
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: WalkArea.x
value: 13.08
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: WalkArea.y
value: 7.85
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: CreatePos.x
value: -4.78
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: CreatePos.y
value: 6.68
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: IsDebugDraw
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: ActiveArea.y
value: 8.75
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: TriggerDistance
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalPosition.x
value: -4.78
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalPosition.y
value: 6.68
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4628036417912431990, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_Name
value: enemy_B (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
--- !u!4 &6926850498603954599 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
m_PrefabInstance: {fileID: 5244615652379338185}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5349686948620608019
PrefabInstance:
m_ObjectHideFlags: 0
@@ -12782,11 +12691,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalPosition.x
value: 1.1
value: 3.55
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalPosition.y
value: 7.36
value: 8.39
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalPosition.z

9
Assets/GameRes/Scenes/InitScene.unity
View File

@@ -12171,11 +12171,10 @@ PolygonCollider2D:
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 0, y: 1}
- {x: -0.95105654, y: 0.30901697}
- {x: -0.5877852, y: -0.80901706}
- {x: 0.58778536, y: -0.80901694}
- {x: 0.9510565, y: 0.30901712}
- - {x: 26.531563, y: 53.809708}
- {x: -51.48693, y: 58.56655}
- {x: -40.640728, y: -62.61262}
- {x: 32.771984, y: -63.329647}
m_UseDelaunayMesh: 0
--- !u!1 &1956134144
GameObject:

78
Assets/GameRes/View/LoadingPanel.prefab
View File

@@ -67,7 +67,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u52A0\u8F7D\u4E2D..."
m_text: "\u8D44\u6E90\u52A0\u8F7D\u4E2D..."
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 44a1bcf4a4bac2c43936c2c51c7018e6, type: 2}
m_sharedMaterial: {fileID: 5897230214493880644, guid: 44a1bcf4a4bac2c43936c2c51c7018e6, type: 2}
@@ -100,7 +100,7 @@ MonoBehaviour:
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
@@ -483,6 +483,8 @@ GameObject:
- component: {fileID: 7725711655814220240}
- component: {fileID: 2276880093168508777}
- component: {fileID: 1366064389188368735}
- component: {fileID: 8461559564607047270}
- component: {fileID: 1706468850796929122}
m_Layer: 6
m_Name: Anim
m_TagString: Untagged
@@ -506,8 +508,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.0000076294, y: -99.015015}
m_SizeDelta: {x: 52, y: 53}
m_AnchoredPosition: {x: 0.0000076293945, y: -47.594994}
m_SizeDelta: {x: 173.57, y: 155.84}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4192622208150824311
CanvasRenderer:
@@ -537,7 +539,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: e067534523ad59f43b803fcae8984822, type: 3}
m_Sprite: {fileID: 21300000, guid: a1d5ea4fdab5b334a92dbeb7670bebb4, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -554,7 +556,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3720686426625178793}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a081423ec3d040398636827c80f5f14c, type: 3}
m_Name:
@@ -625,6 +627,70 @@ MonoBehaviour:
loop: 0
loopDelay: 0
updateMode: 0
--- !u!225 &8461559564607047270
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3720686426625178793}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!114 &1706468850796929122
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3720686426625178793}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 32ce154d21b948608e0ced1e7bbb698e, type: 3}
m_Name:
m_EditorClassIdentifier:
IsAutoPlay: 1
MintPlayer:
TweenOptions:
Duration: 1.5
IsBack: 1
IsFlip: 0
IsLoop: 1
LoopCount: -1
IsCustomEase: 0
EaseType: 0
TimeCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
UpdaterTypeEnum: 2
TweenType: 1
IsLocal: 0
IsAutoStartValue: 0
StartValue: 0.25
EndValue: 1
--- !u!1 &7473179023070997480
GameObject:
m_ObjectHideFlags: 0