Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
BoomMaster
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wanqing
BoomMaster
Commits
a338c6a9
Commit
a338c6a9
authored
Mar 08, 2021
by
xujr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
场景及UI修改
parent
d3a6e6bc
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
556 additions
and
472 deletions
+556
-472
BattleUI.prefab
BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
+339
-183
#B2_Graphics.meta
BoomMaster/Assets/#B2_Graphics.meta
+0
-8
SM_Prop_RopeBarrier_02.prefab
...ets/#C1_Models/Sceen/Prefab/SM_Prop_RopeBarrier_02.prefab
+1
-1
Rope_text 13.mat
BoomMaster/Assets/#C3_Materials/game/Rope_text 13.mat
+1
-1
Rope_text 8.mat
BoomMaster/Assets/#C3_Materials/game/Rope_text 8.mat
+3
-3
Case-Select_frame.png
...Sprites/Sprites by Menu/Home-assets/Case-Select_frame.png
+0
-0
Case-Select_frame.png.meta
...es/Sprites by Menu/Home-assets/Case-Select_frame.png.meta
+116
-0
#Z1_Tabs.meta
BoomMaster/Assets/#Z1_Tabs.meta
+0
-8
#Z2_Documents.meta
BoomMaster/Assets/#Z2_Documents.meta
+0
-8
#Z3_WebAPI.meta
BoomMaster/Assets/#Z3_WebAPI.meta
+0
-8
#Z4_Previews.meta
BoomMaster/Assets/#Z4_Previews.meta
+0
-8
Level8.prefab
BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab
+94
-242
Level9.prefab
BoomMaster/Assets/Res/Prefabs/Levels/Level9.prefab
+2
-2
No files found.
BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
View file @
a338c6a9
This diff is collapsed.
Click to expand it.
BoomMaster/Assets/#B2_Graphics.meta
deleted
100644 → 0
View file @
d3a6e6bc
fileFormatVersion: 2
guid: 317d19313d1d7204e9bbc37122116e7f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#C1_Models/Sceen/Prefab/SM_Prop_RopeBarrier_02.prefab
View file @
a338c6a9
...
...
@@ -58,7 +58,7 @@ MeshRenderer:
m_RenderingLayerMask
:
1
m_RendererPriority
:
0
m_Materials
:
-
{
fileID
:
2100000
,
guid
:
60d108c1758e69f4b9a274acaffda3f2
,
type
:
2
}
-
{
fileID
:
2100000
,
guid
:
3d7bcd9f27f12a641ace73fde29bc686
,
type
:
2
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
...
...
BoomMaster/Assets/#C3_Materials/game/Rope_text 13.mat
View file @
a338c6a9
...
...
@@ -74,5 +74,5 @@ Material:
-
_UVSec
:
0
-
_ZWrite
:
0
m_Colors
:
-
_Color
:
{
r
:
0.
04258634
,
g
:
0.151828
,
b
:
0.31132078
,
a
:
1
}
-
_Color
:
{
r
:
0.
6179246
,
g
:
0.8012036
,
b
:
1
,
a
:
1
}
-
_EmissionColor
:
{
r
:
0
,
g
:
0
,
b
:
0
,
a
:
1
}
BoomMaster/Assets/#C3_Materials/game/Rope_text 8.mat
View file @
a338c6a9
...
...
@@ -9,8 +9,8 @@ Material:
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Rope_text 8
m_Shader
:
{
fileID
:
46
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_ShaderKeywords
:
_GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
m_LightmapFlags
:
6
m_ShaderKeywords
:
_
EMISSION _
GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
m_LightmapFlags
:
2
m_EnableInstancingVariants
:
1
m_DoubleSidedGI
:
0
m_CustomRenderQueue
:
-1
...
...
@@ -74,4 +74,4 @@ Material:
-
_ZWrite
:
1
m_Colors
:
-
_Color
:
{
r
:
0.5896226
,
g
:
0.75264925
,
b
:
1
,
a
:
1
}
-
_EmissionColor
:
{
r
:
0
,
g
:
0
,
b
:
0
,
a
:
1
}
-
_EmissionColor
:
{
r
:
0
.16981131
,
g
:
0.16740832
,
b
:
0.16740832
,
a
:
1
}
BoomMaster/Assets/#E1_Plugins/GUI Mobile Hyper-Casual/Sprites/Sprites by Menu/Home-assets/Case-Select_frame.png
0 → 100644
View file @
a338c6a9
5.49 KB
BoomMaster/Assets/#E1_Plugins/GUI Mobile Hyper-Casual/Sprites/Sprites by Menu/Home-assets/Case-Select_frame.png.meta
0 → 100644
View file @
a338c6a9
fileFormatVersion: 2
guid: cc4daacff354e3e4f9bfaba67ffc0004
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#Z1_Tabs.meta
deleted
100644 → 0
View file @
d3a6e6bc
fileFormatVersion: 2
guid: ca40beb7fc6998f40a6e15a59c6ab599
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#Z2_Documents.meta
deleted
100644 → 0
View file @
d3a6e6bc
fileFormatVersion: 2
guid: 325c11e064841204bbd6de7c85bebef6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#Z3_WebAPI.meta
deleted
100644 → 0
View file @
d3a6e6bc
fileFormatVersion: 2
guid: aa43ce62596b0784081ec9bd0abc8516
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#Z4_Previews.meta
deleted
100644 → 0
View file @
d3a6e6bc
fileFormatVersion: 2
guid: 55c4962f2a6593c4b9c1bb6003b1ff08
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab
View file @
a338c6a9
This diff is collapsed.
Click to expand it.
BoomMaster/Assets/Res/Prefabs/Levels/Level9.prefab
View file @
a338c6a9
...
...
@@ -3843,7 +3843,7 @@ Transform:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
3689566378419704010
}
m_LocalRotation
:
{
x
:
0.030843573
,
y
:
-0.7064338
,
z
:
0.030843573
,
w
:
0.7064338
}
m_LocalPosition
:
{
x
:
21.73
,
y
:
6
.63
,
z
:
0
}
m_LocalPosition
:
{
x
:
21.73
,
y
:
6
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
8917163247091026429
}
...
...
@@ -8505,7 +8505,7 @@ MeshRenderer:
m_RenderingLayerMask
:
1
m_RendererPriority
:
0
m_Materials
:
-
{
fileID
:
2100000
,
guid
:
400304b6d66efe54cb89bbbff0395c14
,
type
:
2
}
-
{
fileID
:
2100000
,
guid
:
9f8ee2d915df9a742b82b097b336893e
,
type
:
2
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment