diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index a6a41c1..a6c9c09 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -20,8 +20,10 @@ GameDefaultMap=/Game/Level/HomeLand.HomeLand [/Script/Engine.RendererSettings] r.Mobile.AntiAliasing=0 -r.AntiAliasingMethod=4 +r.AntiAliasingMethod=0 r.DefaultFeature.MotionBlur=False +r.MSAACount=1 +r.DefaultFeature.AutoExposure=False [CoreRedirects] +PropertyRedirects=(OldName="/Script/BusyRabbit.TerrainTileSetConfig.TerrainTileMapping",NewName="/Script/BusyRabbit.TerrainTileSetConfig.n") diff --git a/Content/Blueprint/Level/Actor/Role/BP_Fox.uasset b/Content/Blueprint/Level/Actor/Role/BP_Fox.uasset index aefdc73..10ab2f4 100644 Binary files a/Content/Blueprint/Level/Actor/Role/BP_Fox.uasset and b/Content/Blueprint/Level/Actor/Role/BP_Fox.uasset differ diff --git a/Content/Blueprint/Level/Actor/Role/BP_Rabbit.uasset b/Content/Blueprint/Level/Actor/Role/BP_Rabbit.uasset index 7f6e2a8..08d418b 100644 Binary files a/Content/Blueprint/Level/Actor/Role/BP_Rabbit.uasset and b/Content/Blueprint/Level/Actor/Role/BP_Rabbit.uasset differ diff --git a/Content/Lua/Level/Actor/LevelFoxRole.lua b/Content/Lua/Level/Actor/LevelFoxRole.lua index 640b127..beeeecb 100644 --- a/Content/Lua/Level/Actor/LevelFoxRole.lua +++ b/Content/Lua/Level/Actor/LevelFoxRole.lua @@ -14,7 +14,6 @@ end function LevelFoxRole:OnMoveDirectionChanged(InDirection) -- 运动组件更新方向响应函数 local cur_animation - if Vector2D.Equals(InDirection, Vector2D.Zero) then -- Idle的情况 local forward_direction = self["MovementComponent"]:GetForwardDirection() if(forward_direction.Y >= 0) then @@ -29,12 +28,10 @@ function LevelFoxRole:OnMoveDirectionChanged(InDirection) cur_animation = "Move/Back" end end - -- if cur_animation ~= self.last_animation then - print("changed", cur_animation) - - self["SpineAnimationComponent"]:SetAnimation(0, cur_animation, true) - self.last_animation = cur_animation - -- end + if cur_animation ~= self.last_animation then + self["SpineAnimationComponent"]:SetAnimation(0, cur_animation, true) + self.last_animation = cur_animation + end end diff --git a/Content/Lua/Level/Actor/LevelRabbitRole.lua b/Content/Lua/Level/Actor/LevelRabbitRole.lua index 8ae5416..1ad5850 100644 --- a/Content/Lua/Level/Actor/LevelRabbitRole.lua +++ b/Content/Lua/Level/Actor/LevelRabbitRole.lua @@ -5,8 +5,8 @@ function LevelRabbitRole:ctor() end function LevelRabbitRole:ReceiveBeginPlay() - -- self["SpineAnimationComponent"]:SetSkin("back/move"); - -- self["SpineAnimationComponent"]:SetAnimation(0, "animation", true); + self["SpineAnimationComponent"]:SetSkin("back/move") + self["SpineAnimationComponent"]:SetAnimation(0, "animation", true) end @@ -16,7 +16,7 @@ function LevelRabbitRole:OnMove(location) end -function LevelRabbitRole:UpdateMoveDirection(InDirection) +function LevelRabbitRole:OnMoveDirectionChanged(InDirection) -- 运动组件更新方向响应函数 local cur_animation if(InDirection.Y >= 0) then @@ -24,6 +24,7 @@ function LevelRabbitRole:UpdateMoveDirection(InDirection) else cur_animation = "back/move" end + print("LevelRabbitRole:OnMoveDirectionChanged", cur_animation) if cur_animation ~= self.last_animation then self["SpineAnimationComponent"]:SetSkin(cur_animation) self["SpineAnimationComponent"]:SetSlotsToSetupPose() @@ -31,28 +32,5 @@ function LevelRabbitRole:UpdateMoveDirection(InDirection) end end --- function LevelRabbitRole:OnDetachCamera() --- print(self, "LevelRabbitRole.OnDetachCamera") - --- -- 禁用弹簧臂的附着 --- self["SpringArmComponent"].bEnableCameraRotationLag = true --- self["SpringArmComponent"].CameraRotationLagSpeed = 0 --- -- 保持当前位置,停止跟随 --- self["SpringArmComponent"].bInheritPitch = true --- self["SpringArmComponent"].bInheritYaw = true --- self["SpringArmComponent"].bInheritRoll = true - --- -- (Pitch=0.000000,Yaw=-90.000000,Roll=0.000000) --- end - --- function LevelRabbitRole:OnReattachCamera() --- print(self, "LevelRabbitRole.OnReattachCamera") --- end - - --- function LevelRabbitRole:OnMoveCamera(direction) --- print(self, "LevelRabbitRole.OnMoveCamera", direction.X, direction.Y) --- end - return Class(nil, nil, LevelRabbitRole) diff --git a/Content/Resource/Spine/Role/Fox/FoxData.uasset b/Content/Resource/Spine/Role/Fox/FoxData.uasset index a795a7d..63b9046 100644 Binary files a/Content/Resource/Spine/Role/Fox/FoxData.uasset and b/Content/Resource/Spine/Role/Fox/FoxData.uasset differ diff --git a/Content/Resource/Spine/Role/Fox/Textures/Fox.uasset b/Content/Resource/Spine/Role/Fox/Textures/Fox.uasset index ae63faf..5e64a76 100644 Binary files a/Content/Resource/Spine/Role/Fox/Textures/Fox.uasset and b/Content/Resource/Spine/Role/Fox/Textures/Fox.uasset differ diff --git a/Source/BusyRabbit/Private/BusyGameInstance.cpp b/Source/BusyRabbit/Private/BusyGameInstance.cpp index 87572f2..5f163e1 100644 --- a/Source/BusyRabbit/Private/BusyGameInstance.cpp +++ b/Source/BusyRabbit/Private/BusyGameInstance.cpp @@ -93,11 +93,10 @@ void UBusyGameInstance::LuaStateInitCallback(NS_SLUA::lua_State* L) { lua_pushcfunction(L, PrintLog); lua_setglobal(L, "PrintLog"); - // EndFrame LuaGameInstance = state->doFile("GameInstance"); LuaGameInstance.getFromTable("OnEndFrame", OnLuaEndFrame); - // עextension + // 注册拓展 RegisterDataTableExtension(); }