加载NMO测试完成

imengyu · Jun 26, 2022 · 1f8e8f3 · 1f8e8f3
1 parent 15170c3
commit 1f8e8f3
Show file tree

Hide file tree

Showing 47 changed files with 412 additions and 322 deletions.
diff --git a/Assets/Game/Materials/Game/SkyLayer.mat b/Assets/Game/Materials/Game/SkyLayer.mat
@@ -57,7 +57,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 550bc03f31e06d54e80a12103627045c, type: 3}
         m_Scale: {x: 2, y: 2}
-        m_Offset: {x: 0.60095716, y: 0.12296641}
+        m_Offset: {x: 0.23072791, y: 0.752728}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

diff --git a/Assets/Game/PackageLanguageRes.xml b/Assets/Game/PackageLanguageRes.xml
@@ -42,7 +42,7 @@
     <Text name="core.ui.SettingsMenuResolution">屏幕分辨率</Text>
     <Text name="core.ui.SettingsMenuQuality">画质</Text>
     <Text name="core.ui.SettingsControlTilte">控制</Text>
-    <Text name="core.ui.SettingsControlMenuReverseControl">反向控制</Text>
+    <Text name="core.ui.SettingsControlMenuReverseControl">反向旋转</Text>
     <Text name="core.ui.SettingsControlMenuForward">向前</Text>
     <Text name="core.ui.SettingsControlMenuBack">向后</Text>
     <Text name="core.ui.SettingsControlMenuLeft">向左</Text>
@@ -232,7 +232,7 @@ Ballance 平衡球 是一款滚球游戏。
     <Text name="core.ui.SettingsMenuResolution">Resolution</Text>
     <Text name="core.ui.SettingsMenuQuality">Quality</Text>
     <Text name="core.ui.SettingsControlTilte">Control</Text>
-    <Text name="core.ui.SettingsControlMenuReverseControl">Reverse Control</Text>
+    <Text name="core.ui.SettingsControlMenuReverseControl">Reverse Rotation</Text>
     <Text name="core.ui.SettingsControlMenuForward">Forward</Text>
     <Text name="core.ui.SettingsControlMenuBack">Back</Text>
     <Text name="core.ui.SettingsControlMenuLeft">Left</Text>
@@ -405,7 +405,7 @@ Quit the tutorial with "RETURN" ...
     <Text name="core.ui.SettingsMenuResolution">螢幕解析度</Text>
     <Text name="core.ui.SettingsMenuQuality">畫質</Text>
     <Text name="core.ui.SettingsControlTilte">控制</Text>
-    <Text name="core.ui.SettingsControlMenuReverseControl">反向控制</Text>
+    <Text name="core.ui.SettingsControlMenuReverseControl">反向旋转</Text>
     <Text name="core.ui.SettingsControlMenuForward">向前</Text>
     <Text name="core.ui.SettingsControlMenuBack">向後</Text>
     <Text name="core.ui.SettingsControlMenuLeft">向左</Text>

diff --git a/Assets/Game/Prefabs/Moduls/P_Modul_01.prefab b/Assets/Game/Prefabs/Moduls/P_Modul_01.prefab
@@ -601,7 +601,7 @@ Transform:
   m_GameObject: {fileID: 8920195196793702193}
   m_LocalRotation: {x: -0.0000010207295, y: -0.7071068, z: -0.7071068, w: 0.0000010207295}
   m_LocalPosition: {x: 2.2799993, y: -0.21000004, z: 0.64000535}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 0.64}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8569134679282989642}

diff --git a/Assets/Game/Prefabs/Moduls/P_Modul_18.prefab b/Assets/Game/Prefabs/Moduls/P_Modul_18.prefab
@@ -54,7 +54,7 @@ AudioSource:
   Priority: 128
   DopplerLevel: 0
   MinDistance: 5.6309257
-  MaxDistance: 50
+  MaxDistance: 90
   Pan2D: 0
   rolloffMode: 2
   BypassEffects: 0
@@ -73,13 +73,13 @@ AudioSource:
       inWeight: 0.33333334
       outWeight: 0.33333334
     - serializedVersion: 3
-      time: 0.496984
-      value: 0.5672954
-      inSlope: -1.4465482
-      outSlope: -1.4465482
+      time: 0.59409094
+      value: 0.547993
+      inSlope: -2.5978694
+      outSlope: -2.5978694
       tangentMode: 0
       weightedMode: 0
-      inWeight: 0.33333334
+      inWeight: 0.128602
       outWeight: 0.33333334
     - serializedVersion: 3
       time: 1

diff --git a/Assets/Game/Scripts/GamePlay/CamManager.lua b/Assets/Game/Scripts/GamePlay/CamManager.lua
@@ -5,18 +5,6 @@ local Quaternion = UnityEngine.Quaternion
 local Time = UnityEngine.Time
 local CamFollow = Ballance2.Game.CamFollow
 
----摄像机旋转方向
-CamRotateType = {
-  ---北。面向+X轴。
-  North = 0,
-  ---东。面向-Z轴。
-  East = 1,
-  ---南。面向-X轴。
-  South = 2,
-  ---西。面向+Z轴。
-  West = 3,
-}
-
 ---摄像机管理器，负责游戏中的摄像机运动。
 ---@class CamManager : GameLuaObjectHostClass
 ---@field _CamOrient GameObject
@@ -38,7 +26,7 @@ CamRotateType = {
 ---@field CamBackVector Vector3 获取摄像机向后向量 [R]
 ---@field CamFollowSpeed number 摄像机跟随速度 [RW]
 ---@field CamIsSpaced boolean 获取摄像机是否空格键升高了 [R]
----@field CamRotateValue number 获取当前摄像机方向（0-3, CamRotateType） [R] @see CamRotateType 设置请使用 RotateTo 方法
+---@field CamRotateValue number 获取当前摄像机方向 [R] 设置请使用 RotateTo 方法
 ---@field CamFollow CamFollow 获取摄像机跟随脚本 [R]
 CamManager = ClassicObject:extend()
 
@@ -57,7 +45,8 @@ function CamManager:new()
   self.CamFollowSpeed = 0.05
   self.CamIsSpaced = false
   self.Target = nil
-  self.CamRotateValue = CamRotateType.North
+  self.CamRotateValue = 0
+  self._CamRotateValueNow = 0
 
   self._CamIsRotateing = false
   self._CamRotateTick = 0
@@ -72,7 +61,6 @@ function CamManager:new()
     y = 0
   }
   self._CamOutSpeed = Vector3.zero
-  self._CamRotate = 0
   self._CamRotateStartDegree = 0
   self._CamRotateTargetDegree = 0
 
@@ -135,8 +123,13 @@ function CamManager:FixedUpdate()
     self._CamRotateTick = self._CamRotateTick + Time.deltaTime
 
     local v = self._CamRotateSpeedCurve:Evaluate(self._CamRotateTick / self._CameraRotateTime)
-    self._CamOrientTransform.localEulerAngles = Vector3(0, self._CamRotateStartDegree + v * self._CamRotateTargetDegree, 0)
+
+    self._CamRotateValueNow = self._CamRotateStartDegree + v * self._CamRotateTargetDegree
+    self._CamOrientTransform.localEulerAngles = Vector3(0, self._CamRotateValueNow, 0)
+
     if v >= 1 then
+      self._CamRotateValueNow = self._CamRotateStartDegree + self._CamRotateTargetDegree
+      self._CamOrientTransform.localEulerAngles = Vector3(0, self._CamRotateValueNow, 0)
       self._CamIsRotateing = false
       self:ResetVector()
     end
@@ -167,28 +160,9 @@ function CamManager:ResetVector()
   self.CamForwerdVector = Quaternion.AngleAxis(-y, Vector3.up) * Vector3.forward
   self.CamBackVector = Quaternion.AngleAxis(-y, Vector3.up) * Vector3.back
 end
----通过旋转方向获取目标角度
----@param type number CamRotateType
-function CamManager:GetRotateDegreeByType(type)
-  if type == CamRotateType.North then return 90
-  elseif type == CamRotateType.East then return 180
-  elseif type == CamRotateType.South then return 270
-  elseif type == CamRotateType.West then return 0
-  end
-  return 0
-end
 function CamManager:_UpdateStateForDebugStats()
   if BALLANCE_DEBUG then 
-    if self.CamRotateValue == CamRotateType.North then 
-      GameUI.GamePlayUI._DebugStatValues['CamDirection'].Value = 'North'
-    elseif self.CamRotateValue == CamRotateType.East then 
-      GameUI.GamePlayUI._DebugStatValues['CamDirection'].Value = 'East'
-    elseif self.CamRotateValue == CamRotateType.South then 
-      GameUI.GamePlayUI._DebugStatValues['CamDirection'].Value = 'South'
-    elseif self.CamRotateValue == CamRotateType.West then 
-      GameUI.GamePlayUI._DebugStatValues['CamDirection'].Value = 'West'
-    end
-
+    GameUI.GamePlayUI._DebugStatValues['CamDirection'].Value = tostring(self._CamOrientTransform.localEulerAngles.y)
     GameUI.GamePlayUI._DebugStatValues['CamState'].Value = 'IsSpaced: '..tostring(self.CamIsSpaced)
       ..' Follow: '..tostring(self.CamFollow.Follow)..' Look: '..tostring(self.CamFollow.Look)
   end
@@ -200,22 +174,16 @@ end
 ---@param go GameObject RestPoint占位符
 function CamManager:SetPosAndDirByRestPoint(go) 
   local rot = go.transform.eulerAngles.y
-  local type = 0
   rot = rot % 360
   if rot < 0 then rot = rot + 360 
   elseif rot > 315 then rot = rot - 360 
   end
 
-  if rot >= -45 and rot < 45 then type = CamRotateType.South
-  elseif rot >= 45 and rot < 135 then type = CamRotateType.West
-  elseif rot >= 135 and rot < 225 then type = CamRotateType.North
-  elseif rot >= 225 and rot < 315 then type = CamRotateType.East
-  end
-
-  self._CamOrientTransform.eulerAngles = Vector3(0, self:GetRotateDegreeByType(type), 0)
+  self._CamOrientTransform.localEulerAngles = Vector3(0, rot - 90, 0)
   self._CamTarget.position = go.transform.position
   self.transform.position = self._CamPosFrame.position
-  self.CamRotateValue = type
+  self.CamRotateValue = rot - 90
+  self._CamRotateValueNow = rot - 90
   self:ResetVector()
   self:_UpdateStateForDebugStats()
   return self
@@ -239,54 +207,23 @@ function CamManager:RotateUp(enable)
   self:_UpdateStateForDebugStats()
   return self
 end
----摄像机旋转指定角度
----@param val number 旋转方向 CamRotateValue
-function CamManager:RotateTo(val)
-  self.CamRotateValue = val
-  local target = self:GetRotateDegreeByType(self.CamRotateValue)
-
-  self._CamRotateStartDegree = self._CamOrientTransform.eulerAngles.y
-  if(target > self._CamRotateStartDegree) then
-    target = target - 360
-  end 
-
-  self._CamRotateTargetDegree = target - self._CamRotateStartDegree
-  self._CamRotateTick = 0
-  self._CamIsRotateing = true
-  self.EventRotateDirectionChanged:Emit(self._CamRotateTargetDegree)
-  self:_UpdateStateForDebugStats()
-  return self
-end
 ---摄像机向右旋转
 function CamManager:RotateRight()
-  self.CamRotateValue = self.CamRotateValue - 1
-  if(self.CamRotateValue < 0) then self.CamRotateValue = 3 end
-  local target = self:GetRotateDegreeByType(self.CamRotateValue)
-
-  self._CamRotateStartDegree = self._CamOrientTransform.eulerAngles.y
-  if(target > self._CamRotateStartDegree) then
-    target = target - 360
-  end 
-
-  self._CamRotateTargetDegree = target - self._CamRotateStartDegree
-  self._CamRotateTick = 0
-  self._CamIsRotateing = true
-  self.EventRotateDirectionChanged:Emit(self._CamRotateTargetDegree)
-  self:_UpdateStateForDebugStats()
+  self:RotateDregree(90)
   return self
 end
 ---摄像机向左旋转
 function CamManager:RotateLeft()
-  self.CamRotateValue = self.CamRotateValue + 1
-  if(self.CamRotateValue > 3) then self.CamRotateValue = 0 end
-  local target = self:GetRotateDegreeByType(self.CamRotateValue)
-
-  self._CamRotateStartDegree = self._CamOrientTransform.eulerAngles.y
-  if(target < self._CamRotateStartDegree) then
-    target = target + 360
-  end 
-
-  self._CamRotateTargetDegree = target - self._CamRotateStartDegree
+  self:RotateDregree(-90)
+  return self
+end
+---摄像机旋转指定度数
+---@param deg number 度数，正数往右，负数往左
+---@return CamManager
+function CamManager:RotateDregree(deg)
+  self.CamRotateValue = self.CamRotateValue + deg
+  self._CamRotateStartDegree = self._CamRotateValueNow
+  self._CamRotateTargetDegree = self.CamRotateValue - self._CamRotateStartDegree
   self._CamRotateTick = 0
   self._CamIsRotateing = true
   self.EventRotateDirectionChanged:Emit(self._CamRotateTargetDegree)