Skip to content

Commit

Permalink
物理和其他细节优化
Browse files Browse the repository at this point in the history
  • Loading branch information
imengyu committed Apr 19, 2022
1 parent e675ff3 commit f000539
Show file tree
Hide file tree
Showing 28 changed files with 105 additions and 45 deletions.
Binary file modified Assets/BallancePhysics/Plugins/x86/bphysics.dll
Binary file not shown.
Binary file modified Assets/BallancePhysics/Plugins/x86_64/bphysics.dll
Binary file not shown.
Binary file modified Assets/BallancePhysics/Plugins/x86_64/bphysics_unity.dll
Binary file not shown.
34 changes: 25 additions & 9 deletions Assets/BallancePhysics/Wapper/PhysicsEnvironment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ private IEnumerator LateCreate() {
private int _PhysicsFixedBodies = 0;
private int _PhysicsUpdateBodies = 0;
private bool lastPauseIsSimuate = false;
private List<PhysicsObject> nextNeedUnFallCollectObjects = new List<PhysicsObject>();
private int tick = 0;

private void FixedUpdate() {
if(Simulate && Handle != IntPtr.Zero) {
Expand All @@ -229,12 +231,18 @@ private void FixedUpdate() {
_PhysicsConstantPushBodies = 0;
_PhysicsFallCollectBodies = 0;
_PhysicsFixedBodies = 0;
if(tick < 1024) tick ++;
else tick = 0;

//模拟

PhysicsApi.API.environment_simulate_dtime(Handle, /*(1.0f / SimulationRate)*/ (Time.fixedDeltaTime) * TimeFactor);
PhysicsApi.API.do_update_all(Handle);

//获取一些参数

PhysicsApi.API.get_stats(Handle, ref _PhysicsActiveBodies);

//更新位置到C#

float[] dat = new float[4];
Expand Down Expand Up @@ -274,8 +282,7 @@ private void FixedUpdate() {
//坠落回收
if(DePhysicsFall < 0 && p.y < DePhysicsFall) {
//DePhysics and DeActive
bodyCurrent.UnPhysicalize(true);
bodyCurrent.gameObject.SetActive(false);
nextNeedUnFallCollectObjects.Add(bodyCurrent);
_PhysicsFallCollectBodies++;
}

Expand All @@ -286,14 +293,23 @@ private void FixedUpdate() {
Profiler.EndSample();

//更新碰撞处理器

Profiler.BeginSample("PhysicsEnvironmentContactEvent");
PhysicsApi.API.do_update_all_physics_contact_detection(Handle);
Profiler.EndSample();

//获取一些参数
if(tick % 6 == 0) {
Profiler.BeginSample("PhysicsEnvironmentContactEvent");
PhysicsApi.API.do_update_all_physics_contact_detection(Handle);
Profiler.EndSample();
}

PhysicsApi.API.get_stats(Handle, ref _PhysicsActiveBodies);
//需要反物理化坠落的物体
if(nextNeedUnFallCollectObjects.Count > 0) {
for (var i = nextNeedUnFallCollectObjects.Count - 1; i >= 0; i--)
{
var bodyCurrent = nextNeedUnFallCollectObjects[i];
bodyCurrent.UnPhysicalize(true);
bodyCurrent.gameObject.SetActive(false);
}
nextNeedUnFallCollectObjects.Clear();
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion Assets/Game/Materials/Game/SkyLayer.mat
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Material:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 550bc03f31e06d54e80a12103627045c, type: 3}
m_Scale: {x: 2, y: 2}
m_Offset: {x: 0.8464844, y: 0.36849833}
m_Offset: {x: 0.79625344, y: 0.31826758}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Game/PackageDef.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<DocLink>https://imengyu.top/ballanceProject/doc</DocLink>
<VersionName>{internal.core.versionName}</VersionName>
<Dependencies>
<Package name="system" minVer="1" mustLoad="true"></Package>
<Package name="system" minVer="15" mustLoad="true"></Package>
</Dependencies>
</BaseInfo>
<EntryCode>PackageEntry</EntryCode>
Expand Down
2 changes: 1 addition & 1 deletion Assets/Game/PackageEntry.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ return {
CoreUnload()
return true
end,
PackageVersion = 1,
PackageVersion = 15,
}
4 changes: 2 additions & 2 deletions Assets/Game/Prefabs/Core/BallCameraHost.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@ MonoBehaviour:
Look: 0
LookSmoothTarget: {fileID: 4411409349751524585}
CameraTransform: {fileID: 7268144510246012001}
SmoothTime: 0.1
SmoothTime: 0.08
SmoothTimeY: 0.5
SmoothToTargetTime: 0.02
SmoothToTargetTime: 0.2
_Target: {fileID: 0}
--- !u!1 &7268144510246012012
GameObject:
Expand Down
10 changes: 4 additions & 6 deletions Assets/Game/Prefabs/Moduls/PE_Balloon.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -4238,8 +4238,6 @@ MonoBehaviour:
componentClassVal: BallancePhysics.Wapper.PhysicsObject
LuaPublicVars: []
ExecuteOrder: 0
CreateStore: 0
CreateActionStore: 0
DebugLoadScript: 0
ManualInputScript: 0
UpdateDelta: 0
Expand Down Expand Up @@ -4637,7 +4635,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8110506288192367252}
m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0}
m_LocalPosition: {x: 4.012886, y: 6.32, z: 14.896176}
m_LocalPosition: {x: 4.012886, y: 6.67, z: 14.896176}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -6135,15 +6133,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3}
propertyPath: m_LocalRotation.w
value: -0.8743188
value: -0.7189082
objectReference: {fileID: 0}
- target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3}
propertyPath: m_LocalRotation.y
value: 0.4853522
value: 0.69510514
objectReference: {fileID: 0}
- target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3}
propertyPath: m_LocalRotation.z
Expand All @@ -6155,7 +6153,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 121.929
value: 91.929
objectReference: {fileID: 0}
- target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
Expand Down
3 changes: 1 addition & 2 deletions Assets/Game/Prefabs/UI/Game/GamePlayUI.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -921,8 +921,6 @@ MonoBehaviour:
componentClassVal: Ballance2.Game.GuiStats
LuaPublicVars: []
ExecuteOrder: 0
CreateStore: 0
CreateActionStore: 0
DebugLoadScript: 0
ManualInputScript: 0
UpdateDelta: 0
Expand All @@ -941,6 +939,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
text: {fileID: 3793511921022688617}
SetToText: 1
UpdateTime: 0.4
DisplayArea:
serializedVersion: 2
x: 20
Expand Down
36 changes: 29 additions & 7 deletions Assets/Game/Prefabs/UI/Pages/PageAboutProject.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ GameObject:
- component: {fileID: 2806728106279321822}
- component: {fileID: 8457467227691381669}
- component: {fileID: 4687215011640910798}
- component: {fileID: 5236123932391610065}
m_Layer: 5
m_Name: Content
m_TagString: Untagged
Expand All @@ -318,10 +319,10 @@ RectTransform:
m_Father: {fileID: 7422316301499555115}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0.000029307}
m_SizeDelta: {x: 0, y: 636.2859}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -140, y: 0.000029307}
m_SizeDelta: {x: 280, y: 636.2859}
m_Pivot: {x: 0, y: 1}
--- !u!222 &8457467227691381669
CanvasRenderer:
Expand Down Expand Up @@ -364,12 +365,33 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u8FD9\u662FBallance\u6E38\u620F\u7684Unity\u5F00\u6E90\u91CD\u5236\u7248\u3002\r\n\r\n\u4F5C\u8005\u662F\u4E00\u4E2ABallance\u5FE0\u5B9E\u7C89\u4E1D\uFF0C\u4ECE\u6700\u521D\u4E3A\u539F\u7248Ballance\u4F5C\u56FE\uFF0C\u5230\u540E\u9762\u5F00\u53D1\u76F8\u5173\u7684\u5C0F\u5DE5\u5177\uFF0C\u6700\u540E\u53C8\u60F3\u8BA9\u8FD9\u4E2A\u8001\u6E38\u620F\u91CD\u65B0\u7115\u53D1\u751F\u673A\u3002
\u8FD9\u4E2A\u9879\u76EE\u4ECE2018\u5E74\u5C31\u5F00\u59CB\u4E86\uFF0C\u5F53\u65F6\u8FD8\u5728B\u5427\u91CC\u53D1\u5E03\u8FC7\u4E00\u4E2A\u6D4B\u8BD5\u7248\u672C\uFF0C\u53EF\u60DC\u592A\u70C2\u3002\u4E2D\u95F4\u53C8\u9AD8\u8003\uFF0C\u505C\u4E86\u597D\u957F\u65F6\u95F4\uFF0C\u4E00\u76F4\u5230\u5927\u5B66\u5FEB\u6BD5\u4E1A\u624D\u53C8\u60F3\u8D77\u6765\uFF0C\u4E00\u76F4\u60F3\u628A\u5B83\u505A\u597D\uFF0C\u53EF\u662F\u56E0\u4E3A\u5929\u751F\u62D6\u5EF6\u75C7\uFF0C\u4E00\u62D6\u518D\u62D6\u3002\u5230\u73B0\u5728\u5DE5\u4F5C\u4E86\uFF0C\u624D\u7EC8\u4E8E\u6709\u52A8\u529B\u505A\uFF0C\u4F46\u60F3\u505A\u53C8\u6CA1\u6709\u592A\u591A\u65F6\u95F4\u4E86\u3002\r\n\r\n\u6E38\u620F\u4F7F\u7528Unity\u5F00\u53D1\uFF0C\u5E0C\u671B\u53EF\u4EE5\u5C06\u8FD9\u4E2A\u8001\u6E38\u620F\u8FD0\u884C\u5230\u624B\u673A\u5E73\u53F0\u4E0A
(\u539F\u7248\u6E38\u620F\u662F\u4F7F\u7528Virtools\u5236\u4F5C\u7684\uFF0C\u4EC5\u53EF\u5728WindowsX86\u5E73\u53F0\u8FD0\u884C)\u3002\r\n\r\n\u6E38\u620F\u4E3B\u8981\u6D41\u7A0B\u5927\u90FD\u4F7F\u7528Lua\u4F5C\u4E3A\u8BED\u8A00\uFF08\u4E3A\u4E86\u517C\u987EMOD\u4E0E\u70ED\u66F4\uFF09\uFF0C\u6E38\u620F\u6846\u67B6\u4F7F\u7528C#\u5199\u3002\r\n\r\n\u672C\u9879\u76EE\u4ECE2019\u5E74\u5F00\u59CB\u5F00\u53D1\uFF0C\u4E2D\u95F4\u65AD\u65AD\u7EED\u7EED\uFF08\u5927\u5B66\u7684\u65F6\u5019\u73A9\u5FC3\u592A\u91CD\uFF09\uFF0C\u73B0\u5728\u5DE5\u4F5C\u4E86\u624D\u7EC8\u4E8E\u6709\u6BC5\u529B\u60F3\u628A\u5B83\u505A\u597D\u3002\u8FD9\u4E2A\u9879\u76EE\u76EE\u524D\u7531\u4F5C\u8005\u5DE5\u4F5C\u4E4B\u4F59\u4E00\u4E2A\u4EBA\u505A\u3002\u975E\u5E38\u6B22\u8FCE\u60F3\u4E0E\u6211\u4E00\u8D77\u5F00\u53D1\u7684\u5C0F\u4F19\u4F34\u52A0\u5165\u6211\u4E00\u8D77\u505A\u5440\u3002\r\n\r\n\u5982\u679C\u4F60\u9047\u5230\u4E86BUG\uFF0C\u6216\u8005\u6709\u5F88\u68D2\u7684\u70B9\u5B50\uFF0C\u5EFA\u8BAE\uFF0C\u6B22\u8FCE\u524D\u5F80\u9879\u76EE\u4E3B\u9875
m_Text: "Ballance Rebuild \u662F\u6EDA\u7403 Ballance \u6E38\u620F\u7684\u5F00\u6E90
Unity \u91CD\u5236\u7248\uFF0C\u7531 \u5FEB\u4E50\u7684\u68A6\u9C7C \u5236\u4F5C\u3002\r\n\r\n\u8FD9\u4E2A\u91CD\u5236\u7248\u590D\u523B\u4E86\u539F\u724890%\u7684\u5185\u5BB9\uFF0C\u5E76\u4E14\u4F7F\u7528\u4E86\u65B0\u7684\u67B6\u6784\uFF0C\u589E\u52A0\u4E86\u8BB8\u591A\u65B0\u7684\u529F\u80FD\uFF0C\u4F60\u53EF\u4EE5\u975E\u5E38\u8F7B\u677E\u7684\u5236\u4F5C\u81EA\u5B9A\u4E49\u6A21\u7EC4\u6216\u8005\u5730\u56FE\u3002\r\n\n\u6E38\u620F\u91C7\u7528\u548C
Virtools \u540C\u4E00\u4E2A\u7269\u7406\u5F15\u64CE\uFF0C\u624B\u611F\u4E0E\u539F\u7248\u76F8\u4F3C\u5EA685%\u3002\r\n\r\n\u4F60\u53EF\u4EE5\u6E38\u73A9\u8FD9\u4E2A\u91CD\u5236\u7248\uFF0C\u8FD8\u53EF\u4EE5\u6839\u636E\u6B64\u91CD\u5236\u7248\u5236\u4F5C\u81EA\u5B9A\u4E49\u6A21\u7EC4\u6216\u8005\u5730\u56FE\uFF0C\u5206\u4EAB\u7ED9\u5176\u4ED6\u73A9\u5BB6\u6E38\u73A9\u3002\r\n\r\n\u9879\u76EE\u7684\u6E90\u4EE3\u7801\u5B58\u653E\u5728
https://github.com/imengyu/Ballance \u3002\n\r\n\u5982\u679C\u4F60\u9047\u5230\u4E86BUG\uFF0C\u6216\u8005\u6709\u5F88\u68D2\u7684\u70B9\u5B50\uFF0C\u5EFA\u8BAE\uFF0C\u6B22\u8FCE\u524D\u5F80\u9879\u76EE\u4E3B\u9875
https://github.com/imengyu/Ballance \u63D0\u4EA4\u4F60\u7684 Issue\uFF0C\u6211\u4EEC\u4E00\u8D77\u8BA8\u8BBA\u5440\u3002\r\n\r\n\u5982\u679C\u5E0C\u671B\u4E3ABallance\u5F00\u53D1\u81EA\u5DF1\u7684mod\uFF0C\u5173\u5361\uFF0C\u6B22\u8FCE\u524D\u5F80
https://github.com/imengyu/Ballance/wiki \u4E86\u89E3\u76F8\u5173\u6559\u7A0B\uFF01\r\n\r\n\u4E5F\u6B22\u8FCE\u5728
Ballance \u5427\u8BA8\u8BBA\u6E38\u620F\u3002"
--- !u!114 &5236123932391610065
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9043915390184519827}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: 280
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1001 &6202128963764579424
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Game/Scripts/GamePlay/BallManager.lua
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ function BallManager:_ActiveCurrentBall()
Velocity:SetVector3Value(current.rigidbody.SpeedVector)
PushValue.Value = '('..string.format("%.2f", current.pushForceX.Force)
..', '..string.format("%.2f", current.pushForceY.Force)
..', '..string.format("%.2f", current.pushForceZ.Force)
..', '..string.format("%.2f", current.pushForceZ.Force)..')'
end
end)
end
Expand Down
2 changes: 1 addition & 1 deletion Assets/Game/Scripts/GamePlay/Balls/Ball.lua
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function Ball:new()
PitchBase = 0.6,
PitchFactor = 0.9,
VolumeBase = 0,
VolumeFactor = 1.9,
VolumeFactor = 2.1,
}
end

Expand Down
2 changes: 1 addition & 1 deletion Assets/Game/Scripts/GamePlay/CamManager.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ CamManager = ClassicObject:extend()
function CamManager:new()
self._CameraRotateTime = 0.4
self._CameraRotateUpTime = 0.8
self._CameraNormalZ = 18
self._CameraNormalZ = 17
self._CameraNormalY = 30
self._CameraSpaceY = 55
self._CameraSpaceZ = 8
Expand Down
7 changes: 7 additions & 0 deletions Assets/Game/Scripts/Highscore/HighscoreManager.lua
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ function HighscoreManager.InitCommand()
if type == 'clear' then
HighscoreData.Data = defaultHighscoreData.DefaultHighscoreData
HighscoreData.LevelNames = defaultHighscoreData.DefaultHighscoreLevelNamesData
HighscoreData.LevelPassStateData = {}
Log.D('highscore', 'Reset to default')
return true
elseif type == 'open-all' then
Expand Down Expand Up @@ -163,6 +164,12 @@ function HighscoreManager.CheckLevelHighScore(levelName, score)
return true
end

---设置指定关卡已经过关
---@param levelName string 关卡名称
function HighscoreManager.AddLevelPassState(levelName)
HighscoreData.LevelPassStateData[levelName] = true
end

---检查指定关卡是否有过关记录
---@param levelName string 关卡名称
function HighscoreManager.CheckLevelPassState(levelName)
Expand Down
8 changes: 7 additions & 1 deletion Assets/Game/Scripts/Native/Small/CamFollow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ public Transform Target
[Tooltip("摄像机平滑移动的时间")]
public float SmoothTimeY = 0.5f;

[LuaApiDescription("摄像机查看跟随锚点平滑移动的时间")]
[Tooltip("摄像机查看跟随锚点平滑移动的时间")]
public float SmoothToTargetTime = 0.1f;

[Tooltip("指定当前跟踪的目标")]
Expand All @@ -72,7 +74,11 @@ private void FixedUpdate()
{
if (Look)
{
LookSmoothTarget.transform.position = Vector3.SmoothDamp(LookSmoothTarget.transform.position, Target.position, ref smoothTargetVelocity, SmoothToTargetTime);
LookSmoothTarget.transform.position = Vector3.SmoothDamp(
LookSmoothTarget.transform.position,
Target.position,
ref smoothTargetVelocity,
SmoothToTargetTime);

if (CameraTransform != null)
CameraTransform.LookAt(LookSmoothTarget);
Expand Down
2 changes: 1 addition & 1 deletion Assets/Game/Scripts/Native/Small/GuiStats.cs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public string Value {
public void SetVector4Value(Vector4 v) { Value = v.ToString(); }
[LuaApiDescription("设置当前条目的 Vector3 数据,数据会自动转为字符串表示形式")]
[LuaApiParamDescription("v", "条目的 Vector3 数据")]
public void SetVector3Value(Vector2 v) { Value = v.ToString(); }
public void SetVector3Value(Vector3 v) { Value = v.ToString(); }
[LuaApiDescription("设置当前条目的 Vector2 数据,数据会自动转为字符串表示形式")]
[LuaApiParamDescription("v", "条目的 Vector2 数据")]
public void SetVector2Value(Vector2 v) { Value = v.ToString(); }
Expand Down
4 changes: 3 additions & 1 deletion Assets/Game/Scripts/Native/UI/StartCustomLevel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,9 @@ private void LoadLevelList(bool refresh) {
FileInfo[] files = direction.GetFiles("*.ballance", SearchOption.TopDirectoryOnly);
Log.D("StartCustomLevel", "Scan Level dir \"" + dir + "\" found " + files.Length + " level fileds");
for (int i = 0; i < files.Length; i++) {
var info = new GameLevelInfo(Path.GetFileNameWithoutExtension(files[i].Name), gamePackageManager);
string name = Path.GetFileNameWithoutExtension(files[i].Name);
if(Regex.IsMatch(name, "^level\\d{2}$")) continue;
var info = new GameLevelInfo(name, gamePackageManager);
loadedLevels.Add(info);
AddLevelToList(info);
}
Expand Down
8 changes: 8 additions & 0 deletions Assets/Game/Scripts/UI/WinScoreUIControl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ local I18N = Ballance2.Services.I18N.I18N
---@field HighlightBar2 GameObject
---@field HighlightBar3 GameObject
---@field HighlightBar4 GameObject
---@field _GamePlayManager GamePlayManager
---@field _CountSound AudioSource
---@field _HighscoreSound AudioSource
---@field _SwitchSound AudioSource
---@field _CountingPointEndCallback function
---@field _IsInSeq boolean
---@field _ScoreNTotal number
WinScoreUIControl = ClassicObject:extend()

function WinScoreUIControl:new()
Expand Down Expand Up @@ -188,6 +195,7 @@ function WinScoreUIControl:Skip()
end
function WinScoreUIControl:SaveHighscore(entryName)
Game.HighScoreManager.AddItem(GamePlay.GamePlayManager.CurrentLevelName, entryName, self._ScoreNTotal)
Game.HighScoreManager.AddLevelPassState(GamePlay.GamePlayManager.NextLevelName)
end
function WinScoreUIControl:_ShowHighscore()
if self.EscKeyID ~= nil then
Expand Down
2 changes: 1 addition & 1 deletion Assets/Levels/Level01/Level.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"customModEventName": "CoreTutorialLevelEventHandler",
"sectorCount": 4,
"endWithUFO": false,
"nextLevel": "Level02",
"nextLevel": "level02",
"internalObjects": {
"PS_LevelStart": "PS_FourFlames_01",
"PE_LevelEnd": "PE_Balloon_01",
Expand Down
2 changes: 1 addition & 1 deletion Assets/Levels/Level02/Level.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"musicTheme": 5,
"skyBox": "F",
"skyLayer": "SkyLayer",
"nextLevel": "Level03",
"nextLevel": "level03",
"lightColor": "#ffffff",
"sectorCount": 5,
"endWithUFO": false,
Expand Down
2 changes: 1 addition & 1 deletion Assets/Levels/template_Level.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"musicTheme": 1,
"skyBox": "A",
"skyLayer": "SkyLayer",
"nextLevel": "Levelx",
"nextLevel": "levelx",
"customMusicTheme": {
"id": 8,
"baseInterval": 5,
Expand Down
2 changes: 1 addition & 1 deletion Assets/Levels/测试关卡/Level.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"musicTheme": 5,
"skyBox": "I",
"skyLayer": "SkyLayer",
"nextLevel": "Level01",
"nextLevel": "level01",
"lightColor": "#ffffff",
"sectorCount": 2,
"endWithUFO": true,
Expand Down
2 changes: 1 addition & 1 deletion Assets/System/Scenes/MainScense.unity
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ MonoBehaviour:
ModulInstance: {fileID: 4918501139308884153, guid: 2bb89f9b46df476439c984861e655001, type: 3}
ModulTestFloor: {fileID: 5785579616074760193, guid: 1e7666ce23f170c4a821475fb2830b09, type: 3}
ModulTestUI: {fileID: 3584871362566811978, guid: b01f637c6dd6e6940a77392b7887a622, type: 3}
LevelName: level03
LevelName: level01
--- !u!1 &963194225
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading

0 comments on commit f000539

Please sign in to comment.