Commit a3a5073f authored by wanqing's avatar wanqing

修改不能打包问题

parent 70f44d37
......@@ -37,7 +37,7 @@ RenderSettings:
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_Sun: {fileID: 1880090179}
m_IndirectSpecularColor: {r: 0.37311926, g: 0.38073996, b: 0.35872698, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &4
......@@ -341,6 +341,98 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ff376a18ea419e546ba78667f1b5c6b3, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1880090177
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1880090178}
- component: {fileID: 1880090179}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &1880090178
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1880090177}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!108 &1880090179
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1880090177}
m_Enabled: 0
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 0.6
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.802082
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.03
m_NormalBias: 0.01
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!114 &551544052906070103 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1259541852, guid: 919382978f5e2684ba83e6daf6491458,
......
......@@ -4,6 +4,7 @@ using UnityEngine;
public class TargetTrigger : MonoBehaviour
{
public float m_speed = 0.1f;
private Vector3 m_pos = new Vector3(-1.61f, 0.22f, 0);
private Vector3 m_posLevelFive = new Vector3(-1.61f, 10.24f, 0);
private Quaternion m_rotation = Quaternion.identity;
......@@ -36,11 +37,11 @@ public class TargetTrigger : MonoBehaviour
{
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
{
m_targetTrans.localPosition = Vector3.Lerp(m_targetTrans.localPosition, m_posLevelFive, 0.03f);
m_targetTrans.localPosition = Vector3.Lerp(m_targetTrans.localPosition, m_posLevelFive, m_speed);
}
else
{
m_targetTrans.localPosition = Vector3.Lerp(m_targetTrans.localPosition, m_pos, 0.03f);
m_targetTrans.localPosition = Vector3.Lerp(m_targetTrans.localPosition, m_pos, m_speed);
}
}
}
......
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEditor;
//using UnityEditor.SceneManagement;
//using UnityEditor;
public class ChainHandle : MonoBehaviour
{
......@@ -10,7 +9,7 @@ public class ChainHandle : MonoBehaviour
// Start is called before the first frame update
private void Awake()
{
Lightmapping.giWorkflowMode = Lightmapping.GIWorkflowMode.Legacy;
//Lightmapping.giWorkflowMode = Lightmapping.GIWorkflowMode.Legacy;
}
private void Start()
{
......
......@@ -704,7 +704,7 @@ MonoBehaviour:
player: {fileID: 0}
enable: 1
invertedAxis: 0
speed: 1.2
speed: 1.6
deadValue: 0.1
valueMethod: 0
curveValue:
......@@ -751,7 +751,7 @@ MonoBehaviour:
player: {fileID: 0}
enable: 1
invertedAxis: 0
speed: 1.2
speed: 1.6
deadValue: 0.1
valueMethod: 0
curveValue:
......
......@@ -4,5 +4,8 @@
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes: []
m_Scenes:
- enabled: 1
path: Assets/0A1_Scenes/DemoScenes.unity
guid: 6e58ccd9deab5cc45ab8336af516167e
m_configObjects: {}
......@@ -12,7 +12,7 @@ PlayerSettings:
targetDevice: 2
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: DefaultCompany
companyName: DySpace
productName: SteelBall
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
......@@ -258,7 +258,99 @@ PlayerSettings:
AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150
m_BuildTargetIcons: []
m_BuildTargetPlatformIcons: []
m_BuildTargetPlatformIcons:
- m_BuildTarget: Android
m_Icons:
- m_Textures: []
m_Width: 432
m_Height: 432
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 324
m_Height: 324
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 216
m_Height: 216
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 162
m_Height: 162
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 108
m_Height: 108
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 81
m_Height: 81
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 192
m_Height: 192
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 144
m_Height: 144
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 96
m_Height: 96
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 72
m_Height: 72
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 48
m_Height: 48
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 36
m_Height: 36
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 192
m_Height: 192
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 144
m_Height: 144
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 96
m_Height: 96
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 72
m_Height: 72
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 48
m_Height: 48
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 36
m_Height: 36
m_Kind: 1
m_SubKind:
m_BuildTargetBatching:
- m_BuildTarget: Standalone
m_StaticBatching: 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