From 85f0d13945f3aef5aef1b3c1b47c77cea0514c17 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 22 Oct 2020 16:06:50 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scenes/Levels/Battle/GemBattle.unity | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Assets/Scenes/Levels/Battle/GemBattle.unity b/Assets/Scenes/Levels/Battle/GemBattle.unity
index f2b5e5e..3f46dbe 100644
--- a/Assets/Scenes/Levels/Battle/GemBattle.unity
+++ b/Assets/Scenes/Levels/Battle/GemBattle.unity
@@ -2995,7 +2995,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 283190499}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -20.53, y: 0.9, z: -6}
+ m_LocalPosition: {x: -20.04, y: 0.9, z: -6}
m_LocalScale: {x: 0.8, y: 1, z: 3}
m_Children: []
m_Father: {fileID: 304173789}
@@ -4728,7 +4728,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 470704233}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -10.3, y: 0.98, z: -6}
+ m_LocalPosition: {x: -9.97, y: 0.98, z: -6}
m_LocalScale: {x: 0.8, y: 1, z: 3}
m_Children: []
m_Father: {fileID: 304173789}
@@ -5243,7 +5243,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 557254050}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -26, y: 0, z: 74.1}
+ m_LocalPosition: {x: -25.13, y: 0, z: 74.4}
m_LocalScale: {x: 9.25, y: 1, z: 9.22}
m_Children: []
m_Father: {fileID: 1765964312}
@@ -5278,7 +5278,7 @@
dimensions:
x: 5
y: 1
- gridSize: 1.12
+ gridSize: 1.1
--- !u!65 &557254053
BoxCollider:
m_ObjectHideFlags: 2
@@ -5290,8 +5290,8 @@
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
- m_Size: {x: 5.6, y: 0, z: 1.12}
- m_Center: {x: 2.8, y: 0, z: 0.56}
+ m_Size: {x: 5.5, y: 0, z: 1.1}
+ m_Center: {x: 2.75, y: 0, z: 0.55}
--- !u!1 &565601936
GameObject:
m_ObjectHideFlags: 0
@@ -9696,7 +9696,7 @@
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
- m_Bits: 4294967295
+ m_Bits: 130871
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
@@ -11539,7 +11539,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1324890350}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 20.68, y: 0.98, z: -6}
+ m_LocalPosition: {x: 20.6, y: 0.98, z: -6}
m_LocalScale: {x: 0.8, y: 1, z: 3}
m_Children: []
m_Father: {fileID: 304173789}
@@ -13973,7 +13973,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1632078501}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -26, y: 0, z: -28.3}
+ m_LocalPosition: {x: -25.13, y: 0, z: -28.3}
m_LocalScale: {x: 9.25, y: 1, z: 9.22}
m_Children: []
m_Father: {fileID: 1765964312}
@@ -14005,11 +14005,11 @@
type: 3}
debugImg: {fileID: 2956664473313611620, guid: d4086517241a50e49aaca47484c61113,
type: 3}
- gridFreePos: 0.1
+ gridFreePos: 0.18
dimensions:
x: 5
y: 3
- gridSize: 1.12
+ gridSize: 1.1
--- !u!65 &1632078504
BoxCollider:
m_ObjectHideFlags: 2
@@ -14021,8 +14021,8 @@
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
- m_Size: {x: 5.6, y: 0, z: 3.3600001}
- m_Center: {x: 2.8, y: 0, z: 1.6800001}
+ m_Size: {x: 5.5, y: 0, z: 3.3000002}
+ m_Center: {x: 2.75, y: 0, z: 1.6500001}
--- !u!1 &1632287006
GameObject:
m_ObjectHideFlags: 0
--
Gitblit v1.9.1