Skip to content

B
BoomMaster
Commit 9163f632 authored by wanqing's avatar wanqing
Browse files
Options

修改界面

parent 8d2b3e21
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1155 additions and 6948 deletions
BoomMaster/Assets/#A1_Scenes/DemoScenes.unity
View file @ 9163f632
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.37311992, g: 0.38074034, b: 0.35872713, a: 1}
m_IndirectSpecularColor: {r: 0.37311926, g: 0.38073996, b: 0.35872698, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &4
LightmapSettings:
......@@ -366,46 +366,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 149752314123208833, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 149752314123208833, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 149752314123208833, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 149752314123208833, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2121116615656044019, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2121116615656044019, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2121116615656044019, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2121116615656044019, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677632144689, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_Name
......@@ -516,26 +476,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6577432729053575209, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6577432729053575209, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6577432729053575209, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6577432729053575209, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
--- !u!114 &6833933616594028096 stripped
......
BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 9163f632
......@@ -5051,7 +5051,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -100, y: 75}
m_AnchoredPosition: {x: -227.1, y: 75}
m_SizeDelta: {x: 65, y: 65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6929955050858487627
......@@ -6045,9 +6045,9 @@ RectTransform:
m_Father: {fileID: 3224150048087170558}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 720, y: -130}
m_SizeDelta: {x: 240, y: 260}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8081977683857758243
......@@ -8500,7 +8500,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -400, y: 75}
m_AnchoredPosition: {x: -449.8, y: 75}
m_SizeDelta: {x: 65, y: 65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2961904627599851865
......@@ -10465,10 +10465,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 725, y: -725}
m_SizeDelta: {x: 250, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464676490241254
CanvasRenderer:
......@@ -10542,10 +10542,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 425, y: -725}
m_SizeDelta: {x: 250, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464676512695455
CanvasRenderer:
......@@ -10813,10 +10813,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 725, y: -1025}
m_SizeDelta: {x: 250, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464676796766618
CanvasRenderer:
......@@ -11384,10 +11384,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 725, y: -125}
m_SizeDelta: {x: 250, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464677159922115
CanvasRenderer:
......@@ -11715,10 +11715,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 125, y: -425}
m_SizeDelta: {x: 250, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464677418123803
CanvasRenderer:
......@@ -11981,10 +11981,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 725, y: -425}
m_SizeDelta: {x: 250, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464677571250788
CanvasRenderer:
......@@ -12501,10 +12501,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 125, y: -725}
m_SizeDelta: {x: 250, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464677866441006
CanvasRenderer:
......@@ -12533,7 +12533,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -12550,7 +12550,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677866441003}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
......@@ -12604,12 +12604,12 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677866441003}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_starParent: {fileID: 0}
m_starParent: {fileID: 7208904381045434081}
m_level: 6
--- !u!1 &6064464677995419504
GameObject:
......@@ -12648,10 +12648,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 425, y: -425}
m_SizeDelta: {x: 250, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464677995419507
CanvasRenderer:
......@@ -12795,10 +12795,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 425, y: -125}
m_SizeDelta: {x: 250, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464678113377479
CanvasRenderer:
......@@ -12942,10 +12942,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 125, y: -125}
m_SizeDelta: {x: 250, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464678311815748
CanvasRenderer:
......@@ -13087,10 +13087,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 125, y: -1025}
m_SizeDelta: {x: 250, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464678319558993
CanvasRenderer:
......@@ -13216,10 +13216,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 425, y: -1025}
m_SizeDelta: {x: 250, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464678379903270
CanvasRenderer:
......@@ -13434,9 +13434,9 @@ RectTransform:
m_Father: {fileID: 3224150048087170558}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 430, y: -130}
m_SizeDelta: {x: 240, y: 260}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8761736939960799828
......@@ -15661,7 +15661,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: '?'
m_Text: 7
--- !u!1 &6833933617082015069
GameObject:
m_ObjectHideFlags: 0
......@@ -18316,9 +18316,9 @@ RectTransform:
m_Father: {fileID: 3224150048087170558}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 140, y: -130}
m_SizeDelta: {x: 240, y: 260}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1215505618301375535
......@@ -18594,7 +18594,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -700, y: 75}
m_AnchoredPosition: {x: -675.1, y: 75}
m_SizeDelta: {x: 65, y: 65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2362660969704643474
......
BoomMaster/Assets/#C1_Models/Asset/SM_Prop_Statue_01 (1)_frags.asset.meta deleted 100644 → 0
View file @ 8d2b3e21
fileFormatVersion: 2
guid: a410b56cbd56e184592d2cdeb02fed8d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#C3_Materials/game/Line.mat
View file @ 9163f632
......@@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Line
m_Shader: {fileID: 4800000, guid: 14d4c79e32412154c9ab93d11f664065, type: 3}
m_Shader: {fileID: 4800000, guid: 29fb46f0961772c44823f3e45f06217f, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
......@@ -75,6 +75,8 @@ Material:
- _AllPower: 5
- _AlphaPower: 7
- _AlphaScale: 1
- _BottleSpecularGloss: 0
- _BottleThickness: 0.001
- _BumpScale: 1
- _Cutoff: 0.5
- _DepthDistance: 0.5
......@@ -82,6 +84,7 @@ Material:
- _Distort: 1
- _DstBlend: 0
- _Factor: 0.01
- _FillAmount: 0
- _FoamSmooth: 0.02
- _FoamSpread: 2
- _FoamStrength: 0.8
......@@ -99,10 +102,11 @@ Material:
- _Parallax: 0.02
- _RampSmooth: 0.1
- _RampThreshold: 0.5
- _Rim: 0
- _RimIntensity: 43
- _RimMax: 1
- _RimMin: 0.5
- _RimPower: 0
- _RimPower: 5
- _ScrollSpeedU: 2
- _ScrollSpeedV: 0
- _SmoothnessTextureChannel: 0
......@@ -117,19 +121,25 @@ Material:
- _WaveFrequency: 1
- _WaveHeight: 0.1
- _WaveSpeed: 2
- _WobbleX: 0
- _WobbleZ: 0
- _ZWrite: 1
- __dummy__: 0
m_Colors:
- _BottleColor: {r: 1, g: 0.83137256, b: 0, a: 1}
- _BottleSpecularColor: {r: 1, g: 0.83137256, b: 0, a: 1}
- _Color: {r: 0.0039215684, g: 1, b: 0.854803, a: 1}
- _ColorTint: {r: 1, g: 0.7653513, b: 0, a: 0.3}
- _DepthColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _FoamColor: {r: 0.9, g: 0.9, b: 0.9, a: 1}
- _FoamColor: {r: 1, g: 0.83137256, b: 0, a: 1}
- _FoamSpeed: {r: 2, g: 2, b: 2, a: 2}
- _HColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
- _InnerColor: {r: 1, g: 0.83137256, b: 0, a: 0.5}
- _InnerColor: {r: 1, g: 0.83137256, b: 0, a: 0.5019608}
- _MainColor: {r: 1, g: 0, b: 0.7330103, a: 1}
- _MoveLightColor: {r: 0, g: 1, b: 0.8245816, a: 1}
- _OutLineColor: {r: 0.990566, g: 0.032707386, b: 0.032707386, a: 1}
- _RimColor: {r: 1, g: 0.83183765, b: 0, a: 1}
- _SColor: {r: 0.3, g: 0.3, b: 0.3, a: 1}
- _Tint: {r: 1, g: 0.83137256, b: 0, a: 1}
- _TopColor: {r: 1, g: 0.83137256, b: 0, a: 1}
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