Skip to content

S
Storage
Commit 35f6dd4d authored by wanqing's avatar wanqing
Browse files
Options

Merge remote-tracking branch 'origin/Yuy'

parents cf8e1fdf a852a16b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 60185 additions and 33 deletions
Storage/Assets/#A1_Scenes/DemoScenes.unity
View file @ 35f6dd4d
This diff is collapsed.
Storage/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 35f6dd4d
......@@ -379,7 +379,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &884162086
RectTransform:
m_ObjectHideFlags: 0
......@@ -591,9 +591,9 @@ RectTransform:
m_Father: {fileID: 6064464677660112695}
m_RootOrder: 1
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, y: 478}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 590}
m_SizeDelta: {x: 239, y: 61}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1920425760
......@@ -787,7 +787,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: -218.52}
m_AnchoredPosition: {x: 0, y: -300}
m_SizeDelta: {x: 402, y: 183}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2140495270
......@@ -980,9 +980,9 @@ RectTransform:
m_Father: {fileID: 6064464677660112695}
m_RootOrder: 0
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, y: 484}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 620}
m_SizeDelta: {x: 746, y: 754}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &551544052248828899
......@@ -1653,7 +1653,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1598298137505124248
RectTransform:
m_ObjectHideFlags: 0
......@@ -11975,7 +11975,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: -298.47}
m_AnchoredPosition: {x: 0, y: -300}
m_SizeDelta: {x: 402, y: 183}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464677757260076
......
Storage/Assets/#C2_Animations/ShowBox/失败_N1.anim
View file @ 35f6dd4d
......@@ -482,7 +482,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 80
value: 45
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -574,7 +574,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 80
value: 45
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -1334,7 +1334,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 80
value: 45
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -1783,7 +1783,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 80
value: 45
inSlope: 0
outSlope: 0
tangentMode: 136
......
Storage/Assets/#C2_Animations/ShowBox/成功_N1.anim
View file @ 35f6dd4d
......@@ -253,7 +253,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 80
value: 45
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -445,7 +445,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 80
value: 45
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -560,7 +560,25 @@ AnimationClip:
path: "\u7279\u6548/\u6210\u529F\u7279\u6548"
classID: 1
script: {fileID: 0}
m_PPtrCurves: []
m_PPtrCurves:
- curve:
- time: 0.75
value: {fileID: 2100000, guid: 4fbb5561d55c8ee408d0a480d9909bb5, type: 2}
- time: 0.9166667
value: {fileID: 2100000, guid: 17ed4644fe06a9a4991e029f9c5d4055, type: 2}
attribute: m_Materials.Array.data[3]
path: Case01/TopRotationPoint/Case01_Top
classID: 23
script: {fileID: 0}
- curve:
- time: 0.75
value: {fileID: 2100000, guid: 4fbb5561d55c8ee408d0a480d9909bb5, type: 2}
- time: 0.9166667
value: {fileID: 2100000, guid: 17ed4644fe06a9a4991e029f9c5d4055, type: 2}
attribute: m_Materials.Array.data[4]
path: Case01/Case01_Bottom
classID: 23
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
......@@ -631,6 +649,20 @@ AnimationClip:
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2259887383
attribute: 3
script: {fileID: 0}
typeID: 23
customType: 21
isPPtrCurve: 1
- serializedVersion: 2
path: 4240414707
attribute: 4
script: {fileID: 0}
typeID: 23
customType: 21
isPPtrCurve: 1
- serializedVersion: 2
path: 626178028
attribute: 1
......@@ -652,7 +684,11 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
pptrCurveMapping:
- {fileID: 2100000, guid: 4fbb5561d55c8ee408d0a480d9909bb5, type: 2}
- {fileID: 2100000, guid: 17ed4644fe06a9a4991e029f9c5d4055, type: 2}
- {fileID: 2100000, guid: 4fbb5561d55c8ee408d0a480d9909bb5, type: 2}
- {fileID: 2100000, guid: 17ed4644fe06a9a4991e029f9c5d4055, type: 2}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
......@@ -1111,7 +1147,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 80
value: 45
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -1387,7 +1423,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 80
value: 45
inSlope: 0
outSlope: 0
tangentMode: 136
......
Storage/Assets/#C2_Animations/UI/Game Winning.anim
View file @ 35f6dd4d
......@@ -29,7 +29,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.0666667
time: 1
value: {x: 2.302476, y: 2.302476, z: 2.302476}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
......@@ -71,8 +71,17 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1.0666667
value: 461
time: 0
value: 483
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 590
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -114,6 +123,90 @@ AnimationClip:
path: NextButton
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 484
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 620
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.y
path: Glow
classID: 224
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 13
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path: Glow
classID: 224
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 13.000002
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path: Image
classID: 224
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
......@@ -136,6 +229,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 83635035
attribute: 538195251
script: {fileID: 0}
typeID: 224
customType: 28
isPPtrCurve: 0
- serializedVersion: 2
path: 2667048251
attribute: 304273561
......@@ -144,19 +244,33 @@ AnimationClip:
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 83635035
path: 1246633515
attribute: 538195251
script: {fileID: 0}
typeID: 224
customType: 28
isPPtrCurve: 0
- serializedVersion: 2
path: 1246633515
attribute: 1460864421
script: {fileID: 0}
typeID: 224
customType: 28
isPPtrCurve: 0
- serializedVersion: 2
path: 83635035
attribute: 1460864421
script: {fileID: 0}
typeID: 224
customType: 28
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1.0666667
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
......@@ -185,7 +299,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.0666667
time: 1
value: 2.302476
inSlope: 0
outSlope: 0
......@@ -213,7 +327,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.0666667
time: 1
value: 2.302476
inSlope: 0
outSlope: 0
......@@ -241,7 +355,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.0666667
time: 1
value: 2.302476
inSlope: 0
outSlope: 0
......@@ -260,8 +374,17 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1.0666667
value: 461
time: 0
value: 483
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 590
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -387,6 +510,90 @@ AnimationClip:
path: NextButton
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 484
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 620
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.y
path: Glow
classID: 224
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 13
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path: Glow
classID: 224
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 13.000002
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path: Image
classID: 224
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
......
Storage/Assets/#C3_Materials/TransparentMat 1.mat 0 → 100644
View file @ 35f6dd4d
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TransparentMat 1
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Ramp:
m_Texture: {fileID: 2800000, guid: 4a056241e2722dc46a7262a8e7073fd9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
- _RimMax: 1
- _RimMin: 0.684
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- _Color: {r: 0, g: 0.7843138, b: 1, a: 0.19607843}
- _EmissionColor: {r: 0, g: 0.142885, b: 0.2264151, a: 1}
- _HColor: {r: 1, g: 1, b: 1, a: 1}
- _RimColor: {r: 1, g: 0, b: 0, a: 0.6}
- _SColor: {r: 0.6981132, g: 0.6981132, b: 0.6981132, a: 1}
Storage/Assets/#C3_Materials/TransparentMat 1.mat.meta 0 → 100644
View file @ 35f6dd4d
fileFormatVersion: 2
guid: 30fb4d580aca533489e04a22c0999976
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Storage/Assets/#C3_Materials/TransparentMat.mat 0 → 100644
View file @ 35f6dd4d
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TransparentMat
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Ramp:
m_Texture: {fileID: 2800000, guid: 4a056241e2722dc46a7262a8e7073fd9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
- _RimMax: 1
- _RimMin: 0.684
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- _Color: {r: 0, g: 0.6392157, b: 1, a: 0.19607843}
- _EmissionColor: {r: 0.005339978, g: 0.08596741, b: 0.2264151, a: 1}
- _HColor: {r: 1, g: 1, b: 1, a: 1}
- _RimColor: {r: 1, g: 0, b: 0, a: 0.6}
- _SColor: {r: 0.6981132, g: 0.6981132, b: 0.6981132, a: 1}
Storage/Assets/#C3_Materials/TransparentMat.mat.meta 0 → 100644
View file @ 35f6dd4d
fileFormatVersion: 2
guid: 17ed4644fe06a9a4991e029f9c5d4055
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Storage/Assets/Res/Levels/Level1.prefab
View file @ 35f6dd4d
......@@ -58004,7 +58004,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 00b664ab48af1bc44b478c52bd2bf797, type: 2}
- {fileID: 2100000, guid: 71106ffca4e2e2c41a355366726bb703, type: 2}
- {fileID: 2100000, guid: dcd57050a04156b4181616de5f296862, type: 2}
- {fileID: 2100000, guid: 71106ffca4e2e2c41a355366726bb703, type: 2}
- {fileID: 2100000, guid: 4fbb5561d55c8ee408d0a480d9909bb5, type: 2}
Storage/Assets/Res/Levels/Level2.prefab
View file @ 35f6dd4d
......@@ -119356,7 +119356,7 @@ Camera:
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
m_BackGroundColor: {r: 0.7686275, g: 0.89019614, b: 1, a: 1}
m_BackGroundColor: {r: 0.2264151, g: 0.2264151, b: 0.2264151, a: 1}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment