diff --git a/Assets/StriveGame/Editor/CustomSettings.cs b/Assets/StriveGame/Editor/CustomSettings.cs index f40f513..7a8f006 100644 --- a/Assets/StriveGame/Editor/CustomSettings.cs +++ b/Assets/StriveGame/Editor/CustomSettings.cs @@ -48,8 +48,9 @@ public static class CustomSettings //_GT(typeof(KeyValuePair)), //------------------------------------------------------------------- - _GT(typeof(Debugger)), - + _GT(typeof(Debugger)), + + _GT(typeof(Color)), _GT(typeof(Component)), _GT(typeof(Behaviour)), _GT(typeof(MonoBehaviour)), @@ -82,7 +83,7 @@ public static class CustomSettings _GT(typeof(KeyCode)), _GT(typeof(SkinnedMeshRenderer)), _GT(typeof(Space)), - + _GT(typeof(MeshRenderer)), _GT(typeof(ParticleEmitter)), _GT(typeof(ParticleRenderer)), @@ -114,7 +115,8 @@ public static class CustomSettings _GT(typeof(InputField)), _GT(typeof(Toggle)), _GT(typeof(Scrollbar)), - + _GT(typeof(Slider)), + _GT(typeof(Util)), _GT(typeof(AppConst)), _GT(typeof(LuaHelper)), @@ -135,7 +137,12 @@ public static class CustomSettings _GT(typeof(KBEngine.PersistentInofs)), _GT(typeof(EasyJoystick)), _GT(typeof(MovingJoystick)), + _GT(typeof(NcEffectFlying)), + + //UGUI HUD TEXT + _GT(typeof(bl_HUDText)).SetBaseType(typeof(System.Object)), + }; public static List dynamicList = new List() diff --git a/Assets/StriveGame/Editor/Packager.cs b/Assets/StriveGame/Editor/Packager.cs index ad24c6b..c464009 100644 --- a/Assets/StriveGame/Editor/Packager.cs +++ b/Assets/StriveGame/Editor/Packager.cs @@ -66,9 +66,11 @@ public static void BuildAssetResource(BuildTarget target) { AssetDatabase.Refresh(); maps.Clear(); - if (AppConst.LuaBundleMode) { + if (AppConst.LuaBundleMode) + { HandleLuaBundle(); - } else { + } + else { HandleLuaFile(); } @@ -166,9 +168,13 @@ static void HandleResBundle() AddBuildMap("CreateAvatar" + AppConst.ExtName, "CreateAvatarPanel.prefab", "Assets/StriveGame/Res/View"); AddBuildMap("Login" + AppConst.ExtName, "LoginPanel.prefab", "Assets/StriveGame/Res/View"); + AddBuildMap("MessageBox" + AppConst.ExtName, "MessageBoxPanel.prefab", "Assets/StriveGame/Res/View"); AddBuildMap("SelectAvatar" + AppConst.ExtName, "SelectAvatarPanel.prefab", "Assets/StriveGame/Res/View"); AddBuildMap("GameWorld" + AppConst.ExtName, "GameWorldPanel.prefab", "Assets/StriveGame/Res/View"); + AddBuildMap("PlayerHead" + AppConst.ExtName, "PlayerHeadPanel.prefab", "Assets/StriveGame/Res/View"); + AddBuildMap("TargetHead" + AppConst.ExtName, "TargetHeadPanel.prefab", "Assets/StriveGame/Res/View"); AddBuildMap("Model" + AppConst.ExtName, "*.prefab", "Assets/StriveGame/Res/Model"); + AddBuildMap("Skill" + AppConst.ExtName, "*.prefab", "Assets/StriveGame/Res/Skill"); AddBuildMap("Terrain" + AppConst.ExtName, "*.prefab", "Assets/StriveGame/Res/Terrain"); } diff --git a/Assets/StriveGame/Lua/Common/define.lua b/Assets/StriveGame/Lua/Common/define.lua index 35e76d8..9f9360d 100644 --- a/Assets/StriveGame/Lua/Common/define.lua +++ b/Assets/StriveGame/Lua/Common/define.lua @@ -3,14 +3,20 @@ CtrlNames = { Login = "LoginCtrl", SelectAvatar = "SelectAvatarCtrl", CreateAvatar = "CreateAvatarCtrl", - GameWorld = "GameWorldCtrl", + GameWorld = "GameWorldCtrl", + MsgBox = "MessageBoxCtrl", + PlayerHead = "PlayerHeadCtrl", + TargetHead = "TargetHeadCtrl", } PanelNames = { "LoginPanel", "SelectAvatarPanel", "CreateAvatarPanel", - "GameWorldPanel", + "GameWorldPanel", + "MessageBoxPanel", + "PlayerHeadPanel", + "TargetHeadPanel", } --协议类型-- diff --git a/Assets/StriveGame/Lua/Controller/GameWorldCtrl.lua b/Assets/StriveGame/Lua/Controller/GameWorldCtrl.lua index 6aa02f6..af94210 100644 --- a/Assets/StriveGame/Lua/Controller/GameWorldCtrl.lua +++ b/Assets/StriveGame/Lua/Controller/GameWorldCtrl.lua @@ -1,4 +1,5 @@ require "Common/define" +require "Controller/MessageBoxCtrl" GameWorldCtrl = {}; local this = GameWorldCtrl; @@ -9,13 +10,15 @@ local gameObject; --构建函数-- function GameWorldCtrl.New() - logWarn("GameWorldCtrl.New--->>"); - return this; + logWarn("GameWorldCtrl.New--->>"); + GameWorldCtrl.hasAwake = 0; + return this; end function GameWorldCtrl.Awake() - logWarn("GameWorldCtrl.Awake--->>"); - panelMgr:CreatePanel('GameWorld', this.OnCreate); + logWarn("GameWorldCtrl.Awake--->>"); + panelMgr:CreatePanel('GameWorld', this.OnCreate); + GameWorldCtrl.hasAwake = 1; end --启动事件-- @@ -27,23 +30,67 @@ function GameWorldCtrl.OnCreate(obj) GameWorld:AddClick(GameWorldPanel.btnRelive, this.OnRelive); GameWorld:AddClick(GameWorldPanel.btnClose, this.OnClose); GameWorld:AddClick(GameWorldPanel.btnSend, this.OnSendMessage); - - logWarn("Start lua--->>"..gameObject.name); + GameWorld:AddClick(GameWorldPanel.btnResetView, this.OnResetView); + GameWorld:AddClick(GameWorldPanel.btnSkill1, this.OnAttackSkill1); + GameWorld:AddClick(GameWorldPanel.btnSkill2, this.OnAttackSkill2); + GameWorld:AddClick(GameWorldPanel.btnSkill3, this.OnAttackSkill3); + GameWorld:AddClick(GameWorldPanel.btnTabTarget, this.OnTabTarget); + + logWarn("Start lua--->>"..gameObject.name); + Event.AddListener("OnDie", this.OnDie); + Event.AddListener("Set_HP", this.Set_HP); + Event.AddListener("Set_HP_Max", this.Set_HP_Max); + Event.AddListener("Set_PlayerName", this.Set_PlayerName); + Event.AddListener("ReceiveChatMessage", this.ReceiveChatMessage); Event.AddListener("OnDie", this.OnDie); Event.AddListener("ReceiveChatMessage", this.ReceiveChatMessage); + --做一些初始化工作 local p = KBEngineLua.player(); if p ~= nil then this.OnDie(p.state); end + this.SetSkillButton(); +end + +--切换选择对象 +function GameWorldCtrl.OnTabTarget( ) + local player = KBEngineLua.player(); + if (player == nil) then + return; + end + + local target = TargetHeadCtrl.target; + + local mindis = 10000; + local minEntity = nil; + for i, entity in pairs(KBEngineLua.entities) do + local obj = entity.renderObj; + if (obj ~= nil and obj.layer == LayerMask.NameToLayer("CanAttack") and entity.className == "Monster" and entity.HP > 0) then + local dis = Vector3.Distance(player.position, obj.transform.position); + if (mindis > dis and (target == nil or target ~= nil and target ~= entity)) then + mindis = dis; + minEntity = entity; + end + end + end + if minEntity ~= nil then + TargetHeadCtrl.target = minEntity; + TargetHeadCtrl.UpdateTargetUI(); + end +end +function GameWorldCtrl.onclick() + print("rensiwei onclick callback") end --复活-- function GameWorldCtrl.OnRelive(go) - local p = KBEngineLua.player(); + MessageBoxCtrl.SetInfo("0000","123456789",GameWorldCtrl.onclick); + MessageBoxCtrl.Show(); + local p = KBEngineLua.player(); if p ~= nil then p:relive(1); end @@ -62,6 +109,11 @@ function GameWorldCtrl.OnSendMessage(go) end end +--重置视角 +function GameWorldCtrl.OnResetView(go) + CameraFollow:ResetView(); +end + --关闭事件-- function GameWorldCtrl.Close() --panelMgr:ClosePanel(CtrlNames.Login); @@ -69,6 +121,49 @@ function GameWorldCtrl.Close() Event.RemoveListener("onConnectStatus", this.onConnectStatus); end +--设置技能按钮-- +function GameWorldCtrl.SetSkillButton() + if #SkillBox.skills == 3 then + GameWorldPanel.btnSkill1.transform:FindChild("Text"):GetComponent("Text").text = SkillBox.skills[1].name; + GameWorldPanel.btnSkill2.transform:FindChild("Text"):GetComponent("Text").text = SkillBox.skills[2].name; + GameWorldPanel.btnSkill3.transform:FindChild("Text"):GetComponent("Text").text = SkillBox.skills[3].name; + end +end + +function GameWorldCtrl.AttackSkill(skillID ) + local player = KBEngineLua.player(); + + if (player == nil) then + return; + end + + local target = TargetHeadCtrl.target; + if (player ~= nil) then + local errorCode = player:useTargetSkill(skillID, target); + if (errorCode == 1) then + log("目标太远"); + --逼近目标 + SkillControl.MoveTo(target.renderObj.transform, SkillBox.Get(skillID).canUseDistMax-1, skillID); + end + if (errorCode == 2) then + log("技能冷却"); + end + if (errorCode == 3) then + log("目标已死亡"); + end + end +end + +function GameWorldCtrl.OnAttackSkill1( ) + this.AttackSkill(SkillBox.skills[1].id); +end +function GameWorldCtrl.OnAttackSkill2( ) + this.AttackSkill(SkillBox.skills[2].id); +end +function GameWorldCtrl.OnAttackSkill3( ) + this.AttackSkill(SkillBox.skills[3].id); +end + ------------事件-- --死亡-- function GameWorldCtrl.OnDie(v) @@ -79,6 +174,32 @@ function GameWorldCtrl.OnDie(v) end end +--------主角头像--- +function GameWorldCtrl.Set_HP(hp) + local slider_hp = GameWorldPanel.Panel_PlayerHead.transform:FindChild("Slider_HP"):GetComponent("Slider"); + local hp_player = GameWorldPanel.Panel_PlayerHead.transform:FindChild("Text_HP"):GetComponent("Text"); + if hp >= 0 then + slider_hp.value = hp; + hp_player.text = hp.. "/" .. slider_hp.maxValue; + end +end +-------设置HP最大值-- +function GameWorldCtrl.Set_HP_Max(value) + local slider_hp = GameWorldPanel.Panel_PlayerHead.transform:FindChild("Slider_HP"):GetComponent("Slider"); + if value > 0 then + slider_hp.maxValue = value; + end +end +----- 设置主角名字-- +function GameWorldCtrl.Set_PlayerName(name) + if (nil ~= GameWorldPanel.Panel_PlayerHead) then + local name_text = GameWorldPanel.Panel_PlayerHead.transform:FindChild("Text_PlayerName"):GetComponent("Text"); + if(string.len(name) >= 0 ) then + name_text.text = name; + end + end +end + --接受信息 function GameWorldCtrl.ReceiveChatMessage(msg) local text = GameWorldPanel.textContent:GetComponent("Text"); @@ -96,3 +217,5 @@ function GameWorldCtrl.ReceiveChatMessage(msg) GameWorldPanel.sb_vertical.value = 0; GameWorldPanel.input_content.text = ""; end + + diff --git a/Assets/StriveGame/Lua/Controller/LoginCtrl.lua b/Assets/StriveGame/Lua/Controller/LoginCtrl.lua index 94b6121..0b04d11 100644 --- a/Assets/StriveGame/Lua/Controller/LoginCtrl.lua +++ b/Assets/StriveGame/Lua/Controller/LoginCtrl.lua @@ -32,8 +32,10 @@ function LoginCtrl.OnCreate(obj) Event.AddListener("onLoginSuccessfully", this.onLoginSuccessfully); Event.AddListener("onLoginFailed", this.onLoginFailed); Event.AddListener("onCreateAccountResult", this.onCreateAccountResult); - Event.AddListener("onReqAvatarList", this.onReqAvatarList); + Event.AddListener("onReqAvatarList", this.onReqAvatarList); + LoginPanel.inputUsername:GetComponent('InputField').text = "zl111"; + LoginPanel.inputPassword:GetComponent('InputField').text = "123456"; end --登录-- diff --git a/Assets/StriveGame/Lua/Controller/MessageBoxCtrl.lua b/Assets/StriveGame/Lua/Controller/MessageBoxCtrl.lua new file mode 100644 index 0000000..61abf55 --- /dev/null +++ b/Assets/StriveGame/Lua/Controller/MessageBoxCtrl.lua @@ -0,0 +1,72 @@ +require "Common/define" + +MessageBoxCtrl = {}; +local this = MessageBoxCtrl; + +local MessageBox; +local transform; +local gameObject; + +--构建函数-- +function MessageBoxCtrl.New() + logWarn("MessageBoxCtrl.New--->>"); + return this; +end + +function MessageBoxCtrl.Awake() + local canvas = find("Canvas"); + if (canvas.transform:Find("MessageBoxPanel") ~= nil) then + this.Show(); + print("MessageBoxPanel have been created!"); + return; + end + logWarn("MessageBoxCtrl.Awake--->>"); + panelMgr:CreatePanel('MessageBox', this.OnCreate); +end + +--启动事件-- +function MessageBoxCtrl.OnCreate(obj) + gameObject = obj; + + MessageBox = gameObject:GetComponent('LuaBehaviour'); + MessageBox:AddClick(MessageBoxPanel.btnOK, this.OnOK); + MessageBox:AddClick(MessageBoxPanel.btnCancle, this.OnCancle); + + logWarn("Start lua--->>"..gameObject.name); + + MessageBoxPanel.txtTitle:GetComponent('Text').text = "title"; + MessageBoxPanel.txtContent:GetComponent('Text').text = "content"; +end + + +function MessageBoxCtrl.OnOK(go) + if (MessageBoxPanel.onClick ~= nil) then + MessageBoxPanel.onClick(); + end + this.Hide(); +end + +function MessageBoxCtrl.OnCancle(go) + this.Hide(); +end + +function MessageBoxCtrl.Hide() + local panel_MsgBox = find("MessageBoxPanel"); + if panel_MsgBox ~= nil then + panel_MsgBox:SetActive(false); + end +end + +function MessageBoxCtrl.Show() + local canvas = find("Canvas"); + local panel_MsgBox = canvas.transform:Find("MessageBoxPanel").gameObject; + if panel_MsgBox ~= nil then + panel_MsgBox:SetActive(true); + end; +end + +function MessageBoxCtrl.SetInfo(strTitle, strContent,onClick) + MessageBoxPanel.txtTitle:GetComponent('Text').text = strTitle; + MessageBoxPanel.txtContent:GetComponent('Text').text = strContent; + MessageBoxPanel.onClick = onClick; +end diff --git a/Assets/StriveGame/Lua/Controller/PlayerHeadCtrl.lua b/Assets/StriveGame/Lua/Controller/PlayerHeadCtrl.lua new file mode 100644 index 0000000..4fa4ca0 --- /dev/null +++ b/Assets/StriveGame/Lua/Controller/PlayerHeadCtrl.lua @@ -0,0 +1,71 @@ +require "Common/define" + +PlayerHeadCtrl = {}; +local this = PlayerHeadCtrl; + +local PlayerHead; +local transform; +local gameObject; + +--构建函数-- +function PlayerHeadCtrl.New() + logWarn("PlayerHeadCtrl.New--->>"); + return this; +end + +function PlayerHeadCtrl.Awake() + logWarn("PlayerHeadCtrl.Awake--->>"); + panelMgr:CreatePanel('PlayerHead', this.OnCreate); + + --Event.AddListener("onPlayerHeadResult", this.onPlayerHeadResult); +end + +--启动事件-- +function PlayerHeadCtrl.OnCreate(obj) + gameObject = obj; + gameObject.transform.position = Vector3.New(87.5, 385, 0); + PlayerHead = gameObject:GetComponent('LuaBehaviour'); + --PlayerHead:AddClick(PlayerHeadPanel.btnPlayerHead, this.OnPlayerHead); + --PlayerHead:AddClick(PlayerHeadPanel.btnCancel, this.OnCancel); + logWarn("Start lua--->>"..gameObject.name); + + this.target = KBEngineLua.player(); + this.UpdateTargetUI(); +end + + +function PlayerHeadCtrl.SetHPMax(v) + PlayerHeadPanel.sliderHp.maxValue = v; + PlayerHeadPanel.textHpDetail.text = PlayerHeadPanel.sliderHp.value .. "/" .. PlayerHeadPanel.sliderHp.maxValue; + +end + +function PlayerHeadCtrl.SetHP(v) + PlayerHeadPanel.sliderHp.value = v; + PlayerHeadPanel.textHpDetail.text = PlayerHeadPanel.sliderHp.value .. "/" .. PlayerHeadPanel.sliderHp.maxValue; +end + +function PlayerHeadCtrl.SetName(v) + PlayerHeadPanel.textTargetName.text = v; +end + +function PlayerHeadCtrl.Deactivate() + gameObject:SetActive(false); +end + +function PlayerHeadCtrl.Activate() + gameObject:SetActive(true); +end + +function PlayerHeadCtrl.UpdateTargetUI() + this.Activate(); + this.SetHPMax(this.target.HP_Max); + this.SetHP(this.target.HP); + this.SetName(this.target.name); +end + +--关闭事件-- +function PlayerHeadCtrl.Close() + --panelMgr:ClosePanel(CtrlNames.CreateAvatar); + destroy(gameObject); +end \ No newline at end of file diff --git a/Assets/StriveGame/Lua/Controller/SelectAvatarCtrl.lua b/Assets/StriveGame/Lua/Controller/SelectAvatarCtrl.lua index e258bf2..50acb9b 100644 --- a/Assets/StriveGame/Lua/Controller/SelectAvatarCtrl.lua +++ b/Assets/StriveGame/Lua/Controller/SelectAvatarCtrl.lua @@ -87,14 +87,21 @@ function SelectAvatarCtrl.OnReqEnterGame(go) name = SelectAvatarPanel.btnAvatar[i].transform:FindChild('Label'):GetComponent('Text').text; break; end + end + if nil == name then + name = SelectAvatarPanel.btnAvatar[1].transform:FindChild('Label'):GetComponent('Text').text; end - for key, value in pairs(this.avatars) do + for key, value in pairs(this.avatars) do if value["name"] == name then dbid = key; end end - p:reqSelectAvatarGame(dbid); - end + p:reqSelectAvatarGame(dbid); + if(0 == GameWorldCtrl.hasAwake) then + GameWorldCtrl.Awake(); + end + end + this.Close(); end --------------------数据发过来的事件----------------------------- diff --git a/Assets/StriveGame/Lua/Controller/TargetHeadCtrl.lua b/Assets/StriveGame/Lua/Controller/TargetHeadCtrl.lua new file mode 100644 index 0000000..05ae091 --- /dev/null +++ b/Assets/StriveGame/Lua/Controller/TargetHeadCtrl.lua @@ -0,0 +1,63 @@ +require "Common/define" + +TargetHeadCtrl = {}; +local this = TargetHeadCtrl; + +local TargetHead; +local transform; +local gameObject; + +--构建函数-- +function TargetHeadCtrl.New() + logWarn("TargetHeadCtrl.New--->>"); + return this; +end + +function TargetHeadCtrl.Awake() + logWarn("TargetHeadCtrl.Awake--->>"); + panelMgr:CreatePanel('TargetHead', this.OnCreate); + +end + +--启动事件-- +function TargetHeadCtrl.OnCreate(obj) + gameObject = obj; + gameObject.transform.position = Vector3.New(87.5, 337, 0); + TargetHead = gameObject:GetComponent('LuaBehaviour'); + + this.Deactivate(); + + logWarn("Start lua--->>"..gameObject.name); +end + +function TargetHeadCtrl.SetHPMax(v) + TargetHeadPanel.sliderHp.maxValue = v; +end + +function TargetHeadCtrl.SetHP(v) + TargetHeadPanel.sliderHp.value = v; +end + +function TargetHeadCtrl.SetName(v) + TargetHeadPanel.textTargetName.text = v; +end + +function TargetHeadCtrl.Deactivate() + gameObject:SetActive(false); +end + +function TargetHeadCtrl.Activate() + gameObject:SetActive(true); +end + +function TargetHeadCtrl.UpdateTargetUI() + this.Activate(); + this.SetHPMax(this.target.HP_Max); + this.SetHP(this.target.HP); + this.SetName(this.target.name); +end + +--关闭事件-- +function TargetHeadCtrl.Close() + destroy(gameObject); +end \ No newline at end of file diff --git a/Assets/StriveGame/Lua/KbePlugins/Entity.lua b/Assets/StriveGame/Lua/KbePlugins/Entity.lua index 30d90e4..99019f5 100644 --- a/Assets/StriveGame/Lua/KbePlugins/Entity.lua +++ b/Assets/StriveGame/Lua/KbePlugins/Entity.lua @@ -20,7 +20,7 @@ KBEngineLua.Entity = -- __init__调用之后设置为true inited = false, renderObj = nil, - character = nil, + gameEntity = nil, } KBEngineLua.Entity.New = function( self , me ) @@ -45,8 +45,9 @@ KBEngineLua.Entity.callPropertysSetMethods = function(self) local oldval = self[name]; if(setmethod ~= nil) then - -- base类属性或者进入世界后cell类属性会触发set_*方法 - if(flags == 0x00000020 or flags == 0x00000040) then + -- base类属性或者进入世界后cell类属性会触发set_*方法 +-- print("rensiwei_"..self.className.."_callPropertysSetMethods_"..name); + if(flags == 0x00000020 or flags == 0x00000040) then if(self.inited and not self.inWorld) then setmethod(self, oldval); end diff --git a/Assets/StriveGame/Lua/KbePlugins/KBEngine.lua b/Assets/StriveGame/Lua/KbePlugins/KBEngine.lua index b51b3a6..a1b00e7 100644 --- a/Assets/StriveGame/Lua/KbePlugins/KBEngine.lua +++ b/Assets/StriveGame/Lua/KbePlugins/KBEngine.lua @@ -38,6 +38,7 @@ KBEngineLua.KBE_FLT_MAX = 3.402823466e+38; KBEngineLua.entity_uuid = nil; KBEngineLua.entity_id = 0; KBEngineLua.entity_type = ""; + -- 当前玩家最后一次同步到服务端的位置与朝向与服务端最后一次同步过来的位置 KBEngineLua.entityLastLocalPos = Vector3.New(0.0, 0.0, 0.0); KBEngineLua.entityLastLocalDir = Vector3.New(0.0, 0.0, 0.0); @@ -305,8 +306,12 @@ KBEngineLua.onImportClientEntityDef = function(stream) local setmethod = nil;--函数 if(Class ~= nil) then setmethod = Class["set_" .. name]; + print("rensiwei "..scriptmethod_name.."set_" .. name); end + if(setmethod == nil) then + print(scriptmethod_name.."_rensiwei_Client_onImportClientEntityDef_notimplent"..properUtype..aliasID..name..defaultValStr..properFlags); + end local savedata = {properUtype, aliasID, name, defaultValStr, utype, setmethod, properFlags}; self_propertys[name] = savedata; diff --git a/Assets/StriveGame/Lua/Logic/CameraFollow.lua b/Assets/StriveGame/Lua/Logic/CameraFollow.lua index 3f36444..97bcee2 100644 --- a/Assets/StriveGame/Lua/Logic/CameraFollow.lua +++ b/Assets/StriveGame/Lua/Logic/CameraFollow.lua @@ -1,5 +1,5 @@ CameraFollow = { - -- The target we are following + -- The target we are following target = nil, -- The distance in the x-z plane to the target distance = 15.0, @@ -13,21 +13,23 @@ CameraFollow = { transform = nil; }; -function CameraFollow:ResetView( ) +local this = CameraFollow; + +function CameraFollow.ResetView( ) -- Early out if we don't have a target - if (self.target == nil) then + if (this.target == nil) then return; end - self.transform = UnityEngine.Camera.main.transform; + this.transform = UnityEngine.Camera.main.transform; -- Calculate the current rotation angles - local wantedRotationAngle = self.target.eulerAngles.y; - local wantedHeight = self.target.position.y + self.height; + local wantedRotationAngle = this.target.eulerAngles.y; + local wantedHeight = this.target.position.y + this.height; - local currentHeight = self.transform.position.y; + local currentHeight = this.transform.position.y; currentHeight = wantedHeight; -- Damp the height - --currentHeight = Mathf.Lerp(currentHeight, wantedHeight, self.heightDamping * UnityEngine.Time.deltaTime); + --currentHeight = Mathf.Lerp(currentHeight, wantedHeight, this.heightDamping * UnityEngine.Time.deltaTime); -- Convert the angle into a rotation local currentRotation = Quaternion.Euler(0, wantedRotationAngle, 0); @@ -35,31 +37,31 @@ function CameraFollow:ResetView( ) --local currentRotation = 1; -- Set the position of the camera on the x-z plane to: - -- distance meters behind the self.target - self.transform.position = self.target.position; + -- distance meters behind the this.target + this.transform.position = this.target.position; - self.transform.position = self.transform.position - currentRotation * Vector3.forward * self.distance; + this.transform.position = this.transform.position - currentRotation * Vector3.forward * this.distance; -- Set the height of the camera - self.transform.position = Vector3.New(self.transform.position.x, currentHeight, self.transform.position.z); + this.transform.position = Vector3.New(this.transform.position.x, currentHeight, this.transform.position.z); - -- Always look at the self.target - self.transform:LookAt(self.target); + -- Always look at the this.target + this.transform:LookAt(this.target); UnityEngine.Camera.main.active = true; end -function CameraFollow:FollowUpdate() +function CameraFollow.FollowUpdate() -- Early out if we don't have a target - if (not self.target) then + if (not this.target) then return; end -- Calculate the current rotation angles - local wantedRotationAngle = self.target.eulerAngles.y; - local wantedHeight = self.target.position.y + self.height; + local wantedRotationAngle = this.target.eulerAngles.y; + local wantedHeight = this.target.position.y + this.height; - local currentRotationAngle = self.transform.eulerAngles.y; - local currentHeight = self.transform.position.y; + local currentRotationAngle = this.transform.eulerAngles.y; + local currentHeight = this.transform.position.y; local deltaAngle = wantedRotationAngle - currentRotationAngle; if (deltaAngle > 180.0) then deltaAngle = deltaAngle - 360; @@ -69,10 +71,10 @@ function CameraFollow:FollowUpdate() if (deltaAngle < -90) then deltaAngle = -180 - deltaAngle; end -- Damp the rotation around the y-axis - currentRotationAngle = Mathf.LerpAngle(currentRotationAngle, currentRotationAngle+deltaAngle, self.rotationDamping * Time.deltaTime); + currentRotationAngle = Mathf.LerpAngle(currentRotationAngle, currentRotationAngle+deltaAngle, this.rotationDamping * Time.deltaTime); -- Damp the height - currentHeight = Mathf.Lerp(currentHeight, wantedHeight, self.heightDamping * UnityEngine.Time.deltaTime); + currentHeight = Mathf.Lerp(currentHeight, wantedHeight, this.heightDamping * UnityEngine.Time.deltaTime); -- Convert the angle into a rotation local currentRotation = Quaternion.Euler(0, currentRotationAngle, 0); @@ -80,14 +82,14 @@ function CameraFollow:FollowUpdate() --local currentRotation = 1; -- Set the position of the camera on the x-z plane to: - -- distance meters behind the self.target - self.transform.position = self.target.position; + -- distance meters behind the this.target + this.transform.position = this.target.position; - self.transform.position = self.transform.position - currentRotation * Vector3.forward * self.distance; + this.transform.position = this.transform.position - currentRotation * Vector3.forward * this.distance; -- Set the height of the camera - self.transform.position = Vector3.New(self.transform.position.x,currentHeight,self.transform.position.z); + this.transform.position = Vector3.New(this.transform.position.x,currentHeight,this.transform.position.z); - -- Always look at the self.target - self.transform:LookAt(self.target); + -- Always look at the this.target + this.transform:LookAt(this.target); end \ No newline at end of file diff --git a/Assets/StriveGame/Lua/Logic/Character.lua b/Assets/StriveGame/Lua/Logic/Character.lua index 64ab737..841172f 100644 --- a/Assets/StriveGame/Lua/Logic/Character.lua +++ b/Assets/StriveGame/Lua/Logic/Character.lua @@ -1,27 +1,31 @@ +require "Logic/GameEntity" + Character = { - entityName = nil, - entity = nil, - m_destDirection = nil, - m_destPosition = nil, - m_position = nil, - m_eulerAngles = nil, - - m_rotation = nil, +-- entityName = nil, +-- entity = nil, +-- m_destDirection = nil, +-- m_destPosition = nil, +-- m_position = nil, +-- m_eulerAngles = nil, + +-- m_rotation = nil, }; -function Character:SetPosition( pos ) - self.m_position = pos:Clone(); - if self.entity.renderObj then - self.entity.renderObj.transform.position = self.m_position; - end -end - -function Character:SetEulerAngles( angles ) - self.m_eulerAngles = angles:Clone(); - if self.entity.renderObj then - self.entity.renderObj.transform.eulerAngles = self.m_eulerAngles; - end -end +Character = GameEntity:New(Character);--继承 + +--function Character:SetPosition( pos ) +-- self.m_position = pos:Clone(); +-- if self.entity.renderObj then +-- self.entity.renderObj.transform.position = self.m_position; +-- end +--end + +--function Character:SetEulerAngles( angles ) +-- self.m_eulerAngles = angles:Clone(); +-- if self.entity.renderObj then +-- self.entity.renderObj.transform.eulerAngles = self.m_eulerAngles; +-- end +--end function Character:New( me ) me = me or {}; @@ -32,21 +36,31 @@ end function Character:Init( entity ) self.entity = entity; - self:StartUpdate(); - self.headName = entity.renderObj.transform:Find("Canvas/Text"):GetComponent("Text"); + self:StartUpdate(); +-- print("rensiwei"..entity.className) + self.headName = entity.renderObj.transform:Find("Canvas/Text"):GetComponent("Text"); self.headNameCanvasTrans = entity.renderObj.transform:Find("Canvas").transform; self.animator = entity.renderObj.transform:GetComponent("Animator"); self.cameraTransform = UnityEngine.Camera.main.transform; end -function Character:SetName( name ) - --绘制头顶文字 - self.entityName = name; - if self.headName ~= nil then - self.headName.text = self.entityName; - end +--function Character:SetName( name ) +-- --绘制头顶文字 +-- self.entityName = name; +-- if self.headName ~= nil then +-- self.headName.text = self.entityName; +-- end +-- if self.entity:isPlayer() then +-- GameWorldCtrl.Set_PlayerName(name); +-- end +--end + +function Character:recvDamage( receiver, attacker, skillID, damageType, damage ) +-- local objHUDText = find("HUDText"); + local HUDText = Game.objHUDText:GetComponent("bl_HUDText"); + HUDText:NewText("Loss: -"..tostring(damage),self.entity.renderObj.transform,Color.red,10,20,-1,2.5,0);--, 8, 20, -1, 2.2); +-- bl_HUDText.NewText(tostring(damage),self.entity.renderObj.transform,Color.green0, 8, 20, -1, 2.2, 0); end - function Character:OnState( v ) --状态 if v == 1 then @@ -56,10 +70,10 @@ function Character:OnState( v ) end end -function Character:StartUpdate() - FixedUpdateBeat:Add(self.FixedUpdate, self); - UpdateBeat:Add(self.Update, self); -end +--function Character:StartUpdate() +-- FixedUpdateBeat:Add(self.FixedUpdate, self); +-- UpdateBeat:Add(self.Update, self); +--end function Character:Update() if self.headNameCanvasTrans then @@ -95,15 +109,15 @@ function Character:Update() flag = true; end end - - if flag then - self.animator.speed = 2.0; - self.animator:SetFloat("Speed", 1.0); - else - self.animator.speed = 1.0; - self.animator:SetFloat("Speed", 0.0); - end - + if self.animator ~= nil then + if flag then + self.animator.speed = 2.0; + self.animator:SetFloat("Speed", 1.0); + else + self.animator.speed = 1.0; + self.animator:SetFloat("Speed", 0.0); + end + end end function Character:FixedUpdate() @@ -117,11 +131,11 @@ function Character:FixedUpdate() end end -function Character:Destroy() - FixedUpdateBeat:Remove(self.FixedUpdate, self); - UpdateBeat:Remove(self.Update, self); - self.entity = nil; - self.headName = nil; - self.headNameCanvasTrans = nil; - self.cameraTransform = nil; -end \ No newline at end of file +--function Character:Destroy() +-- FixedUpdateBeat:Remove(self.FixedUpdate, self); +-- UpdateBeat:Remove(self.Update, self); +-- self.entity = nil; +-- self.headName = nil; +-- self.headNameCanvasTrans = nil; +-- self.cameraTransform = nil; +--end \ No newline at end of file diff --git a/Assets/StriveGame/Lua/Logic/CtrlManager.lua b/Assets/StriveGame/Lua/Logic/CtrlManager.lua index e1cc7e7..397f492 100644 --- a/Assets/StriveGame/Lua/Logic/CtrlManager.lua +++ b/Assets/StriveGame/Lua/Logic/CtrlManager.lua @@ -3,6 +3,8 @@ require "Controller/LoginCtrl" require "Controller/SelectAvatarCtrl" require "Controller/CreateAvatarCtrl" require "Controller/GameWorldCtrl" +require "Controller/PlayerHeadCtrl" +require "Controller/TargetHeadCtrl" CtrlManager = {}; local this = CtrlManager; @@ -11,11 +13,12 @@ local ctrlList = {}; --控制器列表-- function CtrlManager.Init() logWarn("CtrlManager.Init----->>>"); - ctrlList[CtrlNames.Login] = LoginCtrl.New(); ctrlList[CtrlNames.SelectAvatar] = SelectAvatarCtrl.New(); ctrlList[CtrlNames.CreateAvatar] = CreateAvatarCtrl.New(); ctrlList[CtrlNames.GameWorld] = GameWorldCtrl.New(); + ctrlList[CtrlNames.PlayerHead] = PlayerHeadCtrl.New(); + ctrlList[CtrlNames.TargetHead] = TargetHeadCtrl.New(); return this; end diff --git a/Assets/StriveGame/Lua/Logic/Game.lua b/Assets/StriveGame/Lua/Logic/Game.lua index 85b2522..ffc7ac9 100644 --- a/Assets/StriveGame/Lua/Logic/Game.lua +++ b/Assets/StriveGame/Lua/Logic/Game.lua @@ -2,6 +2,7 @@ Event = require 'events' require "Logic/CtrlManager" require "Common/functions" require "Controller/LoginCtrl" +require "Controller/MessageBoxCtrl" require "KbePlugins/KBEngine" require "Kbe/Account" require "Logic/World" @@ -28,6 +29,9 @@ function Game.OnInitOK() --注册LuaView-- this.InitViewPanels(); + MessageBoxCtrl.Awake(); + this.objHUDText = find("HUDText"); + CtrlManager.Init(); local ctrl = CtrlManager.GetCtrl(CtrlNames.Login); if ctrl ~= nil then diff --git a/Assets/StriveGame/Lua/Logic/GameEntity.lua b/Assets/StriveGame/Lua/Logic/GameEntity.lua new file mode 100644 index 0000000..423c959 --- /dev/null +++ b/Assets/StriveGame/Lua/Logic/GameEntity.lua @@ -0,0 +1,105 @@ +GameEntity = { + entityName = nil, + entity = nil, + m_destDirection = nil, + m_destPosition = nil, + m_position = nil, + m_eulerAngles = nil, + + m_rotation = nil, + +}; + +function GameEntity:New( me ) + me = me or {}; + setmetatable(me, self); + self.__index = self; + return me; +end + +function GameEntity:SetPosition( pos ) + self.m_position = pos:Clone(); + if self.entity.renderObj then + self.entity.renderObj.transform.position = self.m_position; + end +end + +function GameEntity:SetEulerAngles( angles ) + self.m_eulerAngles = angles:Clone(); + if self.entity.renderObj then + self.entity.renderObj.transform.eulerAngles = self.m_eulerAngles; + end +end + + +function GameEntity:Init( entity ) + self.entity = entity; + self:StartUpdate(); + self.headName = entity.renderObj.transform:Find("Canvas/Text"):GetComponent("Text"); + self.headNameCanvasTrans = entity.renderObj.transform:Find("Canvas").transform; + self.cameraTransform = UnityEngine.Camera.main.transform; +end + +function GameEntity:SetName( name ) + --绘制头顶文字 + self.entityName = name; + if self.headName ~= nil then + self.headName.text = self.entityName; + end +end + +function GameEntity:OnState( v ) + --状态 +end + +function GameEntity:StartUpdate() + FixedUpdateBeat:Add(self.FixedUpdate, self); + UpdateBeat:Add(self.Update, self); +end + +function GameEntity:Update() + if self.headNameCanvasTrans then + self.headNameCanvasTrans.rotation = self.cameraTransform.rotation; + end + + if self.entity:isPlayer() then + return; + end + + --更新位置和方向 + if self.m_destDirection then + if not self.m_eulerAngles then + self:SetEulerAngles( self.m_destDirection ); + end + + if Vector3.Distance(self.m_eulerAngles, self.m_destDirection) > 0.0004 then + self:SetEulerAngles( self.m_destDirection ); + end + end + + if self.m_destPosition then + if not self.m_position then + self:SetPosition(self.m_destPosition); + end + + local dist = Vector3.Distance(self.m_position, self.m_destPosition) + if dist > 0.01 then + --self:SetPosition(Vector3.Lerp(self.m_position, self.m_destPosition, 1));--100 * UnityEngine.Time.deltaTime)); + self:SetPosition(self.m_destPosition); + end + end + +end + +function GameEntity:FixedUpdate() + +end + +function GameEntity:Destroy() + FixedUpdateBeat:Remove(self.FixedUpdate, self); + UpdateBeat:Remove(self.Update, self); + self.entity = nil; + self.headName = nil; + self.headNameCanvasTrans = nil; + self.cameraTransform = nil; +end \ No newline at end of file diff --git a/Assets/StriveGame/Lua/Logic/InputControl.lua b/Assets/StriveGame/Lua/Logic/InputControl.lua index a84bf70..2c9d320 100644 --- a/Assets/StriveGame/Lua/Logic/InputControl.lua +++ b/Assets/StriveGame/Lua/Logic/InputControl.lua @@ -37,6 +37,8 @@ function InputControl.OnDisable( ) end function InputControl.OnJoystickMove( move ) + + SkillControl.Stop(); local joyPositionX = move.joystickAxis.x; local joyPositionY = move.joystickAxis.y; @@ -54,7 +56,7 @@ function InputControl.OnJoystickMove( move ) this.headNameCanvasTrans.rotation = rotation; --移动摄像机 - CameraFollow:FollowUpdate(); + CameraFollow.FollowUpdate(); --播放奔跑动画 this.animator.speed = 2.0; this.animator:SetFloat("Speed", 1.0); diff --git a/Assets/StriveGame/Lua/Logic/SelectControl.lua b/Assets/StriveGame/Lua/Logic/SelectControl.lua new file mode 100644 index 0000000..fffc2f9 --- /dev/null +++ b/Assets/StriveGame/Lua/Logic/SelectControl.lua @@ -0,0 +1,32 @@ + +SelectControl = {}; + +function SelectControl.Update() + if UnityEngine.Input.GetMouseButtonDown(0) then + local ray = UnityEngine.Camera.main:ScreenPointToRay(UnityEngine.Input.mousePosition); + + local isHit, hit = UnityEngine.Physics.Raycast(ray, nil, 100.0, bit.lshift(1,LayerMask.NameToLayer("CanAttack"))); + if isHit then + for i,v in pairs(KBEngineLua.entities) do + if v.renderObj == hit.collider.gameObject and not v:isPlayer() then + TargetHeadCtrl.target = v; + TargetHeadCtrl.UpdateTargetUI(); + end + end + -- UI_Target ui_target = World.instance.getUITarget(); + -- ui_target.GE_target = hit.collider.GetComponent(); + -- ui_target.UpdateTargetUI(); + + -- string name = Utility.getPreString(ui_target.GE_target.name); + -- if (name == "NPC" && !MenuBox.hasMenu()) then + -- Int32 id = Utility.getPostInt(ui_target.GE_target.name); + -- NPC _npc = (NPC)KBEngineApp.app.findEntity(id); + + -- if _npc != null then + -- UInt32 dialogID = (UInt32)_npc.getDefinedProperty("dialogID"); + -- avatar.dialog(id, dialogID); + -- end + -- end + end + end +end \ No newline at end of file diff --git a/Assets/StriveGame/Lua/Logic/Skill.lua b/Assets/StriveGame/Lua/Logic/Skill.lua new file mode 100644 index 0000000..0670665 --- /dev/null +++ b/Assets/StriveGame/Lua/Logic/Skill.lua @@ -0,0 +1,66 @@ + +Skill = { + name = "", + descr = "", + id = 0, + canUseDistMin = 0, + canUseDistMax = 3, + coolTime = 0.5, + + -- SkillDisplay_Event_Effect = 0 + -- SkillDisplay_Event_Bullet = 1 + displayType = 1, + + skillEffect = "", + restCoolTimer = 0, + +}; + +function Skill:New( me ) + me = me or {}; + setmetatable(me, self); + self.__index = self; + return me; +end + +--1: 太远， 2：冷却，3：已死亡 +function Skill:validCast(caster, target) + local dist = Vector3.Distance(target.position, caster.position); + if dist > self.canUseDistMax then + return 1; + elseif self.restCoolTimer < self.coolTime then + return 2; + elseif caster.state == 1 then + return 3; + end + return 0; +end + +function Skill:updateTimer(second) + self.restCoolTimer = self.restCoolTimer + second; +end + +function Skill:use(caster, target) + caster:cellCall({"useTargetSkill", self.id, target.id}); + self.restCoolTimer = 0; +end + +function Skill:displaySkill(caster, target) + if (self.displayType == 1) then + resMgr:LoadPrefab('Skill', { self.skillEffect }, function(objs) + local renderObj = newObject(objs[0]); + local fly = renderObj:GetComponent("NcEffectFlying"); + fly.FromPos = Vector3.New(caster.position.x, caster.position.y+1, caster.position.z); + fly.ToPos = Vector3.New(target.position.x, target.position.y+1, target.position.z); + --fly.Speed = 5.0f; + --fly.HWRate = 0; + end); + + + elseif (self.displayType == 0) then + resMgr:LoadPrefab('Skill', { self.skillEffect }, function(objs) + local renderObj = newObject(objs[0]); + renderObj.transform.position = Vector3.New(target.position.x, target.position.y+1, target.position.z); + end); + end +end \ No newline at end of file diff --git a/Assets/StriveGame/Lua/Logic/SkillBox.lua b/Assets/StriveGame/Lua/Logic/SkillBox.lua new file mode 100644 index 0000000..0a030ec --- /dev/null +++ b/Assets/StriveGame/Lua/Logic/SkillBox.lua @@ -0,0 +1,46 @@ + +SkillBox = { + skills = {}, + dictSkillDisplay = {}, +}; + +local this = SkillBox; + +function SkillBox.Pull( ) + this.Clear(); + local player = KBEngineLua.player(); + if player ~= nil then + player:cellCall({"requestPull"}); + end +end + +function SkillBox.Clear( ) + this.skills = {}; +end + +function SkillBox.Add( skill ) + for i = 1, #this.skills do + if this.skills[i].id == skill.id then + log("SkillBox::add: " .. skill.id .. " is exist!") + end + end + table.insert(this.skills, skill); +end + +function SkillBox.Remove( skillId ) + for i = 1, #this.skills do + if this.skills[i].id == skillId then + table.remove(this.skills, i); + break; + end + end +end + +function SkillBox.Get( skillId ) + for i = 1, #this.skills do + if this.skills[i].id == skillId then + return this.skills[i]; + end + end + return nil; +end \ No newline at end of file diff --git a/Assets/StriveGame/Lua/Logic/SkillControl.lua b/Assets/StriveGame/Lua/Logic/SkillControl.lua new file mode 100644 index 0000000..bd4b44d --- /dev/null +++ b/Assets/StriveGame/Lua/Logic/SkillControl.lua @@ -0,0 +1,50 @@ + +SkillControl = {}; + +local this = SkillControl; + +function SkillControl.Init(player) + if player == nil then + return; + end + + this.hasDes = false; + this.transform = player.renderObj.transform; + this.animator = player.renderObj:GetComponent("Animator"); + +end +function SkillControl.Update() + --更新技能的冷却时间 + for i, sk in ipairs(SkillBox.skills) do + sk:updateTimer(Time.deltaTime); + end + + --自动追击 + if (this.hasDes) then + if (Vector3.Distance(this.transform.position, this.moveDes.position) < this.minLen) then + this.hasDes = false; + this.animator.speed = 1.0; + this.animator:SetFloat("Speed", 0.0); + GameWorldCtrl.AttackSkill(this.skillId); + else + this.transform:LookAt(this.moveDes); + this.transform:Translate(Vector3.forward * Time.deltaTime * 5); + --移动摄像机 + CameraFollow.FollowUpdate(); + --播放奔跑动画 + this.animator.speed = 2.0; + this.animator:SetFloat("Speed", 1.0); + end + end +end + +function SkillControl.Stop() + this.hasDes = false; +end + +function SkillControl.MoveTo(des, minLen, skillId) + this.hasDes = true; + this.moveDes = des; + this.minLen = minLen; + this.skillId = skillId; +end \ No newline at end of file diff --git a/Assets/StriveGame/Lua/Logic/World.lua b/Assets/StriveGame/Lua/Logic/World.lua index f06f59a..44209e5 100644 --- a/Assets/StriveGame/Lua/Logic/World.lua +++ b/Assets/StriveGame/Lua/Logic/World.lua @@ -1,8 +1,14 @@ require "Logic/CameraFollow" require "Logic/InputControl" require "Logic/Character" +require "Logic/SelectControl" +require "Logic/SkillControl" +require "Controller/GameWorldCtrl" +require "Controller/MessageBoxCtrl" World = {}; +World = { +}; function World.init() Event.AddListener("onAvatarEnterWorld", World.onAvatarEnterWorld); @@ -13,10 +19,11 @@ function World.init() Event.AddListener("set_position", World.set_position); Event.AddListener("set_direction", World.set_direction); Event.AddListener("set_name", World.set_name); - Event.AddListener("set_state", World.set_state); - Event.AddListener("updatePosition", World.updatePosition); + Event.AddListener("set_state", World.set_state); + Event.AddListener("set_HP", World.set_HP); + Event.AddListener("set_HP_Max", World.set_HP_Max); + Event.AddListener("updatePosition", World.updatePosition); Event.AddListener("recvDamage", World.recvDamage) - end function World.onAvatarEnterWorld( avatar ) @@ -31,8 +38,8 @@ function World.onAvatarEnterWorld( avatar ) go.transform.position = avatar.position; --go.transform.direction = avatar.direction; CameraFollow.target = go.transform; - CameraFollow:ResetView(); - CameraFollow:FollowUpdate(); + CameraFollow.ResetView(); + CameraFollow.FollowUpdate(); InputControl.Init(avatar); InputControl.OnEnable(); @@ -44,10 +51,21 @@ function World.onAvatarEnterWorld( avatar ) if joystick then joystick.gameObject:SetActive(true); end + + --初始化角色技能控制 + SkillControl.Init(avatar); end); - GameWorldCtrl.Awake(); + if(0 == GameWorldCtrl.hasAwake) then + GameWorldCtrl.Awake(); + end + PlayerHeadCtrl.Awake(); + TargetHeadCtrl.Awake(); + SelectAvatarCtrl.Close(); + + UpdateBeat:Add(SelectControl.Update); + UpdateBeat:Add(SkillControl.Update); end @@ -57,7 +75,7 @@ function World.onEnterWorld( entity ) end if entity.className == "Gate" then - resMgr:LoadPrefab('Model', { 'player' }, function(objs) + resMgr:LoadPrefab('Model', { 'Gate' }, function(objs) entity.renderObj = newObject(objs[0]); entity.renderObj.transform.position = entity.position; World.InitEntity(entity); @@ -69,7 +87,7 @@ function World.onEnterWorld( entity ) World.InitEntity(entity); end); elseif entity.className == "DroppedItem" then - resMgr:LoadPrefab('Model', { 'player' }, function(objs) + resMgr:LoadPrefab('Model', { 'droppedItem' }, function(objs) entity.renderObj = newObject(objs[0]); entity.renderObj.transform.position = entity.position; World.InitEntity(entity); @@ -91,9 +109,12 @@ function World.onEnterWorld( entity ) end function World.InitEntity( entity ) - --开始循环 - entity.character = Character:New(); - entity.character:Init(entity); + if entity.className == "Gate" or entity.className == "DroppedItem" then + entity.gameEntity = GameEntity:New(); + else + entity.gameEntity = Character:New(); + end + entity.gameEntity:Init(entity); if entity.name then World.set_name( entity , entity.name ) @@ -101,8 +122,8 @@ function World.InitEntity( entity ) end function World.onLeaveWorld(entity) - if entity.character ~= nil then - entity.character:Destroy(); + if entity.gameEntity ~= nil then + entity.gameEntity:Destroy(); end if entity.renderObj ~= nil then destroy(entity.renderObj); @@ -117,32 +138,91 @@ function World.addSpaceGeometryMapping( path ) end function World.set_position( entity ) - entity.character:SetPosition(entity.position); + entity.gameEntity:SetPosition(entity.position); end function World.set_direction( entity ) - entity.character.m_destDirection = Vector3.New(entity.direction.y, entity.direction.z, entity.direction.x); + entity.gameEntity.m_destDirection = Vector3.New(entity.direction.y, entity.direction.z, entity.direction.x); end function World.set_name( entity , v) - if entity.character then - entity.character:SetName(v); + if entity.gameEntity then + entity.gameEntity:SetName(v); end end +--function World.set_HP( entity , v) +-- if entity:isPlayer() then +-- GameWorldCtrl.Set_HP(v); +-- end +--end + +--function World.set_HP_Max( entity , v) +---- print("rensiwei Set_HP_Max"..v) +-- if entity:isPlayer() then--当前选择的角色 +-- GameWorldCtrl.Set_HP_Max(v); +-- end +--end + function World.set_state( entity , v) - if entity.character then - entity.character:OnState(v); + if entity.gameEntity then + entity.gameEntity:OnState(v); end if entity:isPlayer() then GameWorldCtrl.OnDie(v); end end +function World.set_HP( entity , v) + if entity.renderObj ~= nil then + if PlayerHeadCtrl.target == entity then + PlayerHeadCtrl.UpdateTargetUI(); + end + if TargetHeadCtrl.target == entity then + TargetHeadCtrl.UpdateTargetUI(); + end + end +end + +function World.set_HP_Max( entity , v) + if entity.renderObj ~= nil then + if PlayerHeadCtrl.target == entity then + PlayerHeadCtrl.UpdateTargetUI(); + end + if TargetHeadCtrl.target == entity then + TargetHeadCtrl.UpdateTargetUI(); + end + end +end + function World.updatePosition( entity ) - entity.character.m_destPosition = entity.position; + entity.gameEntity.m_destPosition = entity.position; end function World.recvDamage( receiver, attacker, skillID, damageType, damage ) - log("damage:"..damage); + local sk = SkillBox.Get(skillID); + if (sk ~= nil) then + local renderObj = attacker.renderObj; + renderObj:GetComponent("Animator"):Play("Punch"); + + if attacker:isPlayer() then + local dir = receiver.position - attacker.position; + renderObj.transform:LookAt(Vector3.New(renderObj.transform.position.x + dir.x, renderObj.transform.position.y, renderObj.transform.position.z + dir.z)); + end + + --显示技能效果 + sk:displaySkill(attacker, receiver); + end +-- print("rensiwei a nil enity ： receiver"..receiver.."KBEngineLua.Avatar.id:"..KBEngineLua.Avatar.id1); +-- local entity = KBEngineLua.findEntity(receiver); +-- if(entity == nil) then +-- print("rensiwei a nil enity ： receiver"..receiver.."KBEngineLua.Avatar.id:"..KBEngineLua.Avatar.id); +-- end +-- if(receiver == KBEngineLua.Avatar.id) then--受伤的是主角 +-- receiver.character:recvDamage( receiver, attacker, skillID, damageType, damage ); +-- else +-- print("rensiwei a nil enity00000"); +-- end + receiver.gameEntity:recvDamage( receiver, attacker, skillID, damageType, damage ); + log("damage:"..damage); end \ No newline at end of file diff --git a/Assets/StriveGame/Lua/View/GameWorldPanel.lua b/Assets/StriveGame/Lua/View/GameWorldPanel.lua index d6c12cd..c008ad4 100644 --- a/Assets/StriveGame/Lua/View/GameWorldPanel.lua +++ b/Assets/StriveGame/Lua/View/GameWorldPanel.lua @@ -20,9 +20,18 @@ function GameWorldPanel.InitPanel() this.PanelDie = transform:FindChild("Panel_die").gameObject; this.btnRelive = transform:FindChild("Panel_die/Button_relive").gameObject; this.btnClose = transform:FindChild("Button_close").gameObject; - this.textContent = transform:FindChild("Scroll View/Viewport/trans_content").gameObject; - this.sb_vertical = transform:FindChild("Scroll View/Scrollbar Vertical"):GetComponent("Scrollbar"); - this.input_content = transform:FindChild("InputField_content"):GetComponent("InputField"); + this.textContent = transform:FindChild("Scroll View/Viewport/trans_content").gameObject; + this.textPos = transform:FindChild("Text_pos").gameObject; + this.sb_vertical = transform:FindChild("Scroll View/Scrollbar Vertical"):GetComponent("Scrollbar"); + this.input_content = transform:FindChild("InputField_content"):GetComponent("InputField"); + this.Panel_PlayerHead = transform:FindChild("Panel_PalyerHead").gameObject; + this.btnResetView = transform:FindChild("Button_resetView").gameObject; + this.btnSkill1 = transform:FindChild("Button_skill1").gameObject; + this.btnSkill2 = transform:FindChild("Button_skill2").gameObject; + this.btnSkill3 = transform:FindChild("Button_skill3").gameObject; + this.btnTabTarget = transform:FindChild("Button_tabTarget").gameObject; +-- local name_text = GameWorldPanel.Panel_PlayerHead:FindChild("Text_PlayerName"); + end --单击事件-- diff --git a/Assets/StriveGame/Lua/View/LoginPanel.lua b/Assets/StriveGame/Lua/View/LoginPanel.lua index 72d1059..3208934 100644 --- a/Assets/StriveGame/Lua/View/LoginPanel.lua +++ b/Assets/StriveGame/Lua/View/LoginPanel.lua @@ -27,3 +27,8 @@ function LoginPanel.OnDestroy() logWarn("OnDestroy---->>>"); end +function LoginPanel.Tick() + print("rensiwei int tick!"); +end + + diff --git a/Assets/StriveGame/Lua/View/MessageBoxPanel.lua b/Assets/StriveGame/Lua/View/MessageBoxPanel.lua new file mode 100644 index 0000000..3295111 --- /dev/null +++ b/Assets/StriveGame/Lua/View/MessageBoxPanel.lua @@ -0,0 +1,34 @@ +local transform; +local gameObject; + +MessageBoxPanel = {}; +local this = MessageBoxPanel; + +--启动事件-- +function MessageBoxPanel.Awake(obj) + gameObject = obj; + transform = obj.transform; + + this.InitPanel(); + logWarn("Awake lua--->>"..gameObject.name); +end + +--初始化面板-- +function MessageBoxPanel.InitPanel() + this.btnOK = transform:FindChild("Button_OK").gameObject; + this.btnCancle = transform:FindChild("Button_Cancle").gameObject; + this.txtTitle = transform:FindChild("Text_Title").gameObject; + this.txtContent = transform:FindChild("Text_Content").gameObject; + +-- gameObject.active = false;初始化完成以后不显示 + gameObject:SetActive(false); +end + +--单击事件-- +function MessageBoxPanel.OnDestroy() + logWarn("OnDestroy---->>>"); +end + +function MessageBoxPanel.Tick(go) + print("rensiwei Tick "..Time.deltaTime); +end \ No newline at end of file diff --git a/Assets/StriveGame/Lua/View/PlayerHeadPanel.lua b/Assets/StriveGame/Lua/View/PlayerHeadPanel.lua new file mode 100644 index 0000000..cff5527 --- /dev/null +++ b/Assets/StriveGame/Lua/View/PlayerHeadPanel.lua @@ -0,0 +1,28 @@ +local transform; +local gameObject; + +PlayerHeadPanel = {}; +local this = PlayerHeadPanel; + +--启动事件-- +function PlayerHeadPanel.Awake(obj) + + gameObject = obj; + transform = obj.transform; + + this.InitPanel(); + logWarn("Awake lua--->>"..gameObject.name); +end + +--初始化面板-- +function PlayerHeadPanel.InitPanel() + this.sliderHp = transform:FindChild("Slider_targetHP"):GetComponent("Slider"); + this.textTargetName = transform:FindChild("Text_targetName"):GetComponent("Text"); + this.textHpDetail = transform:FindChild("Text_hp"):GetComponent("Text"); +end + +--单击事件-- +function PlayerHeadPanel.OnDestroy() + logWarn("OnDestroy---->>>"); +end + diff --git a/Assets/StriveGame/Lua/View/TargetHeadPanel.lua b/Assets/StriveGame/Lua/View/TargetHeadPanel.lua new file mode 100644 index 0000000..e661d54 --- /dev/null +++ b/Assets/StriveGame/Lua/View/TargetHeadPanel.lua @@ -0,0 +1,27 @@ +local transform; +local gameObject; + +TargetHeadPanel = {}; +local this = TargetHeadPanel; + +--启动事件-- +function TargetHeadPanel.Awake(obj) + + gameObject = obj; + transform = obj.transform; + + this.InitPanel(); + logWarn("Awake lua--->>"..gameObject.name); +end + +--初始化面板-- +function TargetHeadPanel.InitPanel() + this.sliderHp = transform:FindChild("Slider_targetHP"):GetComponent("Slider"); + this.textTargetName = transform:FindChild("Text_targetName"):GetComponent("Text"); +end + +--单击事件-- +function TargetHeadPanel.OnDestroy() + logWarn("OnDestroy---->>>"); +end + diff --git a/Assets/StriveGame/Lua/kbe/Avatar.lua b/Assets/StriveGame/Lua/kbe/Avatar.lua index fb2f20e..ae5d686 100644 --- a/Assets/StriveGame/Lua/kbe/Avatar.lua +++ b/Assets/StriveGame/Lua/kbe/Avatar.lua @@ -1,4 +1,6 @@ require "Kbe/Interface/GameObject" +require "Logic/SkillBox" +require "Logic/Skill" KBEngineLua.Avatar = { itemDict = {}, @@ -27,12 +29,16 @@ function KBEngineLua.Avatar:updatePlayer(x, y, z, yaw) self.position.y = y; self.position.z = z; - self.direction.z = yaw; + self.direction.z = yaw; + if(GameWorldPanel.textPos ~= nil) then + GameWorldPanel.textPos:GetComponent('Text').text = string.format("%.1f", self.position.x) ..","..string.format("%.1f", self.position.z); + end end function KBEngineLua.Avatar:onEnterWorld() if self:isPlayer() then Event.Brocast("onAvatarEnterWorld", self); + SkillBox.Pull(); end end @@ -44,7 +50,87 @@ function KBEngineLua.Avatar:sendChatMessage(msg) self:baseCall({"sendChatMessage", self.name .. ": " .. msg}); end +function KBEngineLua.Avatar:useTargetSkill(skillID, target) + local skill = SkillBox.Get(skillID); + if (skill == nil) then + return 4; + end + + if target == nil then + return 4; + end + local errorCode = skill:validCast(self, target); + if (errorCode == 0) then + skill:use(self, target); + return errorCode; + end + return errorCode; +end + -------client method----------------------------------- + function KBEngineLua.Avatar:ReceiveChatMessage(msg) Event.Brocast("ReceiveChatMessage", msg); -end \ No newline at end of file +end + +function KBEngineLua.Avatar:onAddSkill(skillID) + log(self.className .. "::onAddSkill(" .. skillID .. ")"); + + local skill = Skill:New(); + skill.id = skillID; + skill.name = skillID .. " "; + if skillID == 1 then + skill.displayType = 1; + skill.canUseDistMax = 30; + skill.skillEffect = "skill1"; + skill.name = "魔法球"; + elseif skillID == 2 then + skill.displayType = 1; + skill.canUseDistMax = 30; + skill.skillEffect = "skill2"; + skill.name = "火球"; + elseif skillID == 3 then + skill.displayType = 1; + skill.canUseDistMax = 20; + skill.skillEffect = "skill3"; + skill.name = "治疗"; + elseif skillID == 4 then + skill.displayType = 0; + skill.canUseDistMax = 5; + skill.skillEffect = "skill4"; + skill.name = "斩击"; + elseif skillID == 5 then + skill.displayType = 0; + skill.canUseDistMax = 5; + skill.skillEffect = "skill5"; + skill.name = "挥击"; + elseif skillID == 6 then + skill.displayType = 0; + skill.canUseDistMax = 5; + skill.skillEffect = "skill6"; + skill.name = "吸血"; + else + skill.displayType = 0; + skill.canUseDistMax = 5; + skill.skillEffect = "skill6"; + skill.name = "未知"; + end; + + SkillBox.Add(skill); + +end + +function KBEngineLua.Avatar:onRemoveSkill(skillID) + log(className .. "::onRemoveSkill(" .. skillID .. ")"); + SkillBox.Remove(skillID); +end + +--function KBEngineLua.Avatar:set_HP_Max(old) +-- local v = self.HP_Max; +-- Event.Brocast("set_HP_Max", self, v); +--end + +--function KBEngineLua.Avatar:set_MP_Max(old) +-- local v = self.MP_Max; +---- Event.Brocast("set_MP_Max", self, v);endendend +--end diff --git a/Assets/StriveGame/Lua/kbe/Interface/GameObject.lua b/Assets/StriveGame/Lua/kbe/Interface/GameObject.lua index fb1c2ad..4766afb 100644 --- a/Assets/StriveGame/Lua/kbe/Interface/GameObject.lua +++ b/Assets/StriveGame/Lua/kbe/Interface/GameObject.lua @@ -35,11 +35,33 @@ function KBEngineLua.Entity:set_name(old) Event.Brocast("set_name", self, v); end +function KBEngineLua.Entity:set_HP(old)--注意方法名区分大小写 + local v = self.HP; +-- print("rensiwei HP"..self.HP); + Event.Brocast("set_HP", self, v); +end + +function KBEngineLua.Entity:set_HP_Max(old) + local v = self.HP_Max; + print("rensiwei HP_Max"..self.HP_Max); + Event.Brocast("set_HP_Max", self, v); +end + function KBEngineLua.Entity:set_state(old) local v = self.state; Event.Brocast("set_state", self, v); end +function KBEngineLua.Entity:set_HP(old) + local v = self.HP; + Event.Brocast("set_HP", self, v); +end + +function KBEngineLua.Entity:set_HP_Max(old) + local v = self.HP_Max; + Event.Brocast("set_HP_Max", self, v); +end + function KBEngineLua.Entity:recvDamage(attackerID, skillID, damageType, damage) --Dbg.DEBUG_MSG(className + "::recvDamage: attackerID=" + attackerID + ", skillID=" + skillID + ", damageType=" + damageType + ", damage=" + damage); diff --git a/Assets/StriveGame/Res/Model/player.prefab b/Assets/StriveGame/Res/Model/player.prefab index eb419ad..3b90b17 100644 --- a/Assets/StriveGame/Res/Model/player.prefab +++ b/Assets/StriveGame/Res/Model/player.prefab @@ -8,7 +8,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 419050} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-sub_hips m_TagString: Untagged m_Icon: {fileID: 0} @@ -23,7 +23,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 447482} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shoulder_fk_ns_ch_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -38,7 +38,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 485198} - m_Layer: 0 + m_Layer: 9 m_Name: f_pinky_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -53,7 +53,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 450740} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_middle_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -68,7 +68,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 416624} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_middle_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -83,7 +83,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 497338} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-thigh_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -98,7 +98,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 401474} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-shin_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -113,7 +113,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 465770} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -128,7 +128,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 415260} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_fk_R_socket2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -143,7 +143,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 433904} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shoulder_ik_ns_intr_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -158,7 +158,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 407560} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-thigh_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -173,7 +173,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 489366} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_ring_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -188,7 +188,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 431342} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_pinky_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -221,7 +221,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 417958} - m_Layer: 0 + m_Layer: 9 m_Name: f_pinky_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -236,7 +236,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 436868} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_index_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -251,7 +251,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 482734} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-spine_flex m_TagString: Untagged m_Icon: {fileID: 0} @@ -266,7 +266,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 475750} - m_Layer: 0 + m_Layer: 9 m_Name: shin_hose_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -281,7 +281,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 435298} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shoulder_rh_ns_ch_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -296,7 +296,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 405780} - m_Layer: 0 + m_Layer: 9 m_Name: VIS-hand_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -311,7 +311,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 456860} - m_Layer: 0 + m_Layer: 9 m_Name: shoulder_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -326,7 +326,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 459746} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-thumb_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -341,7 +341,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 407636} - m_Layer: 0 + m_Layer: 9 m_Name: torso m_TagString: Untagged m_Icon: {fileID: 0} @@ -356,7 +356,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 459634} - m_Layer: 0 + m_Layer: 9 m_Name: VIS-hand_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -371,7 +371,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 497744} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-hand_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -386,7 +386,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 446118} - m_Layer: 0 + m_Layer: 9 m_Name: knee_hose_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -401,7 +401,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 477384} - m_Layer: 0 + m_Layer: 9 m_Name: foot_roll_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -416,7 +416,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 463792} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_middle_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -431,7 +431,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 447076} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_ring_01_L_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -446,7 +446,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 405078} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-palm_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -461,7 +461,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 435076} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_stretch_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -476,7 +476,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 463592} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-neck_follow m_TagString: Untagged m_Icon: {fileID: 0} @@ -491,7 +491,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 406848} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-spine_flex_s m_TagString: Untagged m_Icon: {fileID: 0} @@ -506,7 +506,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 444440} - m_Layer: 0 + m_Layer: 9 m_Name: VIS-foot_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -521,7 +521,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 476392} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_index_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -536,7 +536,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 447748} - m_Layer: 0 + m_Layer: 9 m_Name: elbow_hose_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -551,7 +551,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 459124} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-toe_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -566,7 +566,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 485204} - m_Layer: 0 + m_Layer: 9 m_Name: thigh_hose_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -581,7 +581,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 417088} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_ring_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -596,7 +596,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 425614} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_middle_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -611,7 +611,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 460424} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-thumb_01_L_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -626,7 +626,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 458592} - m_Layer: 0 + m_Layer: 9 m_Name: upper_arm_fk_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -641,7 +641,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 456208} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-palm_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -656,7 +656,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 484398} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_fk_R_socket2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -671,7 +671,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 432012} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-palm_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -686,7 +686,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 413470} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-thigh_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -701,7 +701,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 404186} - m_Layer: 0 + m_Layer: 9 m_Name: upper_arm_hose_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -716,7 +716,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 433394} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-neck m_TagString: Untagged m_Icon: {fileID: 0} @@ -731,7 +731,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 470564} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-foot_R_roll_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -746,7 +746,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 407950} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_stretch_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -761,7 +761,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 486510} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_stretch_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -776,7 +776,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 410026} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-neck m_TagString: Untagged m_Icon: {fileID: 0} @@ -791,7 +791,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 495908} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-shoulder_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -806,7 +806,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 416532} - m_Layer: 0 + m_Layer: 9 m_Name: root m_TagString: Untagged m_Icon: {fileID: 0} @@ -821,7 +821,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 486042} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-foot_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -836,7 +836,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 470518} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_index_01_R_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -851,7 +851,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 447772} - m_Layer: 0 + m_Layer: 9 m_Name: f_middle_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -866,7 +866,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 420618} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-par_spine m_TagString: Untagged m_Icon: {fileID: 0} @@ -881,7 +881,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 400936} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-foot_L_rocker_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -896,7 +896,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 474682} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-hips m_TagString: Untagged m_Icon: {fileID: 0} @@ -911,7 +911,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 480430} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -926,7 +926,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 405062} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_index_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -941,7 +941,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 419364} - m_Layer: 0 + m_Layer: 9 m_Name: elbow_hose_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -956,7 +956,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 476366} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-chest m_TagString: Untagged m_Icon: {fileID: 0} @@ -971,7 +971,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 432318} - m_Layer: 0 + m_Layer: 9 m_Name: thumb_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -986,7 +986,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 497656} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_smth_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1001,7 +1001,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 432066} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-hand_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1016,7 +1016,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 462762} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_index_01_L_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1031,7 +1031,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 494576} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-palm_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1046,7 +1046,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 485286} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-hand_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1061,7 +1061,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 410054} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_antistr_fk_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1076,7 +1076,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 405686} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hips_rh_ns_intr m_TagString: Untagged m_Icon: {fileID: 0} @@ -1091,7 +1091,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 464134} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_index_01_R_tip m_TagString: Untagged m_Icon: {fileID: 0} @@ -1106,7 +1106,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 416886} - m_Layer: 0 + m_Layer: 9 m_Name: forearm_fk_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1121,7 +1121,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 408570} - m_Layer: 0 + m_Layer: 9 m_Name: f_pinky_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1136,7 +1136,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 405524} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_smth_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1151,7 +1151,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 489820} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_nostr_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1166,7 +1166,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 472574} - m_Layer: 0 + m_Layer: 9 m_Name: hips m_TagString: Untagged m_Icon: {fileID: 0} @@ -1181,7 +1181,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 438632} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-head_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1196,7 +1196,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 466826} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-chest_flex m_TagString: Untagged m_Icon: {fileID: 0} @@ -1211,7 +1211,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 403188} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_middle_01_R_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1226,7 +1226,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 442856} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-palm_04_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1241,7 +1241,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 403770} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-thigh_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1256,7 +1256,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 475116} - m_Layer: 0 + m_Layer: 9 m_Name: f_middle_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1271,7 +1271,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 488510} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_pinky_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1286,7 +1286,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 442664} - m_Layer: 0 + m_Layer: 9 m_Name: f_pinky_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1301,7 +1301,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 499694} - m_Layer: 0 + m_Layer: 9 m_Name: toe_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1316,7 +1316,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 486886} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_pinky_01_R_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1331,7 +1331,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 419024} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_nostr_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1346,7 +1346,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 432864} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_junc_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1361,7 +1361,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 448370} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_ring_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1376,7 +1376,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 469836} - m_Layer: 0 + m_Layer: 9 m_Name: foot_fk_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1391,7 +1391,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 402414} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-thumb_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1406,7 +1406,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 403916} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-thumb_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1421,7 +1421,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 435386} - m_Layer: 0 + m_Layer: 9 m_Name: thumb_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1436,7 +1436,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 446812} - m_Layer: 0 + m_Layer: 9 m_Name: knee_target_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1451,7 +1451,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 499532} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_ring_01_L_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1466,7 +1466,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 488020} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_ring_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1481,7 +1481,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 479370} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_middle_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1496,7 +1496,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 414508} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_hose_parent_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1511,7 +1511,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 490724} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_ring_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1526,7 +1526,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 468046} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-shoulder_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1541,7 +1541,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 427234} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-palm_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1556,7 +1556,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 426302} - m_Layer: 0 + m_Layer: 9 m_Name: thigh_hose_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1571,7 +1571,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 405408} - m_Layer: 0 + m_Layer: 9 m_Name: palm_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1586,7 +1586,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 453642} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-head_003 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1601,7 +1601,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 440554} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_ring_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1616,7 +1616,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 423768} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_middle_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1648,7 +1648,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 450460} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-upper_arm_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1663,7 +1663,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 402568} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-head_004 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1678,7 +1678,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 449392} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_pinky_01_R_tip m_TagString: Untagged m_Icon: {fileID: 0} @@ -1693,7 +1693,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 433898} - m_Layer: 0 + m_Layer: 9 m_Name: f_ring_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1708,7 +1708,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 437036} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thumb_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1723,7 +1723,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 420340} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-forearm_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1738,7 +1738,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 448832} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-thumb_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1753,7 +1753,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 447564} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hips_ik_ns_ch m_TagString: Untagged m_Icon: {fileID: 0} @@ -1768,7 +1768,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 486982} - m_Layer: 0 + m_Layer: 9 m_Name: chest m_TagString: Untagged m_Icon: {fileID: 0} @@ -1783,7 +1783,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 462546} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-sub_spine m_TagString: Untagged m_Icon: {fileID: 0} @@ -1798,7 +1798,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 475314} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-shoulder_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1813,7 +1813,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 424620} - m_Layer: 0 + m_Layer: 9 m_Name: f_index_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1828,7 +1828,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 424834} - m_Layer: 0 + m_Layer: 9 m_Name: thumb_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1843,7 +1843,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 418098} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_smth_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1858,7 +1858,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 443796} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_middle_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1873,7 +1873,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 481704} - m_Layer: 0 + m_Layer: 9 m_Name: head_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1888,7 +1888,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 423428} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_smth_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1903,7 +1903,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 456566} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_ring_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1918,7 +1918,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 459784} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_index_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1933,7 +1933,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 437084} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hand_L_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1948,7 +1948,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 430802} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-thumb_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1963,7 +1963,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 425698} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-heel_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1978,7 +1978,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 463130} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-hips m_TagString: Untagged m_Icon: {fileID: 0} @@ -1993,7 +1993,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 414260} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-foot_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2008,7 +2008,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 442378} - m_Layer: 0 + m_Layer: 9 m_Name: forearm_hose_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2023,7 +2023,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 476318} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hips_rh_ns_ch m_TagString: Untagged m_Icon: {fileID: 0} @@ -2038,7 +2038,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 409544} - m_Layer: 0 + m_Layer: 9 m_Name: shin_fk_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2053,7 +2053,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 431906} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_pinky_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2068,7 +2068,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 400238} - m_Layer: 0 + m_Layer: 9 m_Name: f_ring_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2083,7 +2083,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 475278} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shoulder_fk_ns_intr_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2098,7 +2098,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 440072} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_fk_L_socket1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2113,7 +2113,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 404228} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_fk_L_socket1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2128,7 +2128,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 445448} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_stretch_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2143,7 +2143,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 464532} - m_Layer: 0 + m_Layer: 9 m_Name: VIS-upper_arm_pole_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2158,7 +2158,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 493586} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_nostr_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2173,7 +2173,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 482832} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_index_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2188,7 +2188,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 427186} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_pinky_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2203,7 +2203,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 404542} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_ring_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2218,7 +2218,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 450940} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-shin_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2233,7 +2233,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 486980} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-spine m_TagString: Untagged m_Icon: {fileID: 0} @@ -2248,7 +2248,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 416636} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_index_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2263,7 +2263,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 495852} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_pinky_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2278,7 +2278,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 448076} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_index_01_L_tip m_TagString: Untagged m_Icon: {fileID: 0} @@ -2293,7 +2293,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 438878} - m_Layer: 0 + m_Layer: 9 m_Name: palm_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2308,7 +2308,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 418492} - m_Layer: 0 + m_Layer: 9 m_Name: f_ring_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2323,7 +2323,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 485498} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-head_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2338,7 +2338,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 452382} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2353,7 +2353,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 447500} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_pinky_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2368,7 +2368,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 408752} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-thumb_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2383,7 +2383,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 488858} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-head_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2398,7 +2398,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 402816} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-palm_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2413,7 +2413,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 420124} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_nostr_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2428,7 +2428,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 485390} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_fk_R_socket1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2443,7 +2443,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 471388} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_middle_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2458,7 +2458,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 467020} - m_Layer: 0 + m_Layer: 9 m_Name: elbow_target_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2473,7 +2473,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 445470} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_middle_01_L_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2488,7 +2488,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 404202} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-toe_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2503,7 +2503,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 429732} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_pinky_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2518,7 +2518,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 427588} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_middle_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2533,7 +2533,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 421732} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_junc_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2548,7 +2548,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 424830} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_fk_R_socket1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2563,7 +2563,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 448938} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-palm_04_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2578,7 +2578,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 476944} - m_Layer: 0 + m_Layer: 9 m_Name: shoulder_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2593,7 +2593,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 486100} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-thumb_01_R_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2608,7 +2608,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 417690} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-foot_L_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2623,7 +2623,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 431054} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-spine_reverse m_TagString: Untagged m_Icon: {fileID: 0} @@ -2638,7 +2638,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 438954} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_smth_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2653,7 +2653,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 449400} - m_Layer: 0 + m_Layer: 9 m_Name: knee_target_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2668,7 +2668,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 415788} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-toe_R_socket1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2683,7 +2683,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 473404} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-heel_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2698,7 +2698,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 468536} - m_Layer: 0 + m_Layer: 9 m_Name: f_index_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2713,7 +2713,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 440094} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_index_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2728,7 +2728,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 416056} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-head_001_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2743,7 +2743,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 413244} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-palm_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2758,7 +2758,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 438156} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-upper_arm_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2773,7 +2773,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 407690} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-shin_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2788,7 +2788,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 444336} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2803,7 +2803,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 406300} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_hose_parent_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2818,7 +2818,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 458390} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_antistr_fk_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2833,7 +2833,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 430326} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thumb_01_L_tip m_TagString: Untagged m_Icon: {fileID: 0} @@ -2848,7 +2848,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 404928} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_smth_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2863,7 +2863,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 426704} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shoulder_rh_ns_ch_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2879,7 +2879,7 @@ GameObject: m_Component: - 4: {fileID: 418190} - 137: {fileID: 13776172} - m_Layer: 0 + m_Layer: 9 m_Name: rabbit m_TagString: Untagged m_Icon: {fileID: 0} @@ -2894,7 +2894,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 498190} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-toe_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2909,7 +2909,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 482898} - m_Layer: 0 + m_Layer: 9 m_Name: f_pinky_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2924,7 +2924,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 430614} - m_Layer: 0 + m_Layer: 9 m_Name: foot_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2939,7 +2939,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 418680} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hips_fk_ns_intr_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2954,7 +2954,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 463706} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-forearm_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2969,7 +2969,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 487578} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2984,7 +2984,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 463912} - m_Layer: 0 + m_Layer: 9 m_Name: thumb_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2999,7 +2999,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 478078} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_middle_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3014,7 +3014,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 434950} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hips_fk_ns_ch m_TagString: Untagged m_Icon: {fileID: 0} @@ -3029,7 +3029,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 454418} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thumb_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3044,7 +3044,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 458136} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_middle_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3059,7 +3059,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 458896} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_antistr_fk_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3074,7 +3074,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 456036} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-forearm_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3089,7 +3089,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 492242} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hips_fk_ns_ch_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3104,7 +3104,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 418534} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_stretch_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3119,7 +3119,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 482018} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_fk_L_socket2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3134,7 +3134,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 497362} - m_Layer: 0 + m_Layer: 9 m_Name: thigh_fk_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3149,7 +3149,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 497040} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-head m_TagString: Untagged m_Icon: {fileID: 0} @@ -3164,7 +3164,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 469096} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-toe_L_parent m_TagString: Untagged m_Icon: {fileID: 0} @@ -3179,7 +3179,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 481516} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_index_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3194,7 +3194,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 444204} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-upper_arm_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3209,7 +3209,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 401660} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_pinky_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3224,7 +3224,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 444872} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_hose_parent_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3239,7 +3239,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 441232} - m_Layer: 0 + m_Layer: 9 m_Name: knee_hose_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3254,7 +3254,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 475994} - m_Layer: 0 + m_Layer: 9 m_Name: shin_fk_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3269,7 +3269,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 498964} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_stretch_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3284,7 +3284,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 428848} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-elbow_hose_parent_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3299,7 +3299,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 494944} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_hose_parent_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3314,7 +3314,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 487724} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-sub_chest m_TagString: Untagged m_Icon: {fileID: 0} @@ -3329,7 +3329,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 425880} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_ring_01_R_tip m_TagString: Untagged m_Icon: {fileID: 0} @@ -3344,7 +3344,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 488258} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-palm_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3359,7 +3359,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 486774} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_pinky_01_R_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3374,7 +3374,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 469546} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-foot_R_roll_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3389,7 +3389,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 459826} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-palm_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3404,7 +3404,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 416778} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3419,7 +3419,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 458972} - m_Layer: 0 + m_Layer: 9 m_Name: hand_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3434,7 +3434,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 412736} - m_Layer: 0 + m_Layer: 9 m_Name: VIS-foot_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3449,7 +3449,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 424952} - m_Layer: 0 + m_Layer: 9 m_Name: f_ring_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3464,7 +3464,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 496684} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-thumb_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3479,7 +3479,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 445702} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shoulder_rh_ns_intr_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3494,7 +3494,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 477270} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_ring_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3509,7 +3509,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 454338} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-foot_L_roll_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3524,7 +3524,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 461538} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shoulder_rh_ns_intr_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3539,7 +3539,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 439106} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-hand_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3554,7 +3554,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 423494} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-toe_R_parent m_TagString: Untagged m_Icon: {fileID: 0} @@ -3569,7 +3569,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 491788} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_pinky_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3584,7 +3584,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 472362} - m_Layer: 0 + m_Layer: 9 m_Name: f_ring_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3599,7 +3599,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 478636} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hand_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3614,7 +3614,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 405902} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-shoulder_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3629,7 +3629,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 437030} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3644,7 +3644,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 474724} - m_Layer: 0 + m_Layer: 9 m_Name: foot_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3659,7 +3659,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 453910} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-palm_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3674,7 +3674,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 491422} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3689,7 +3689,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 458850} - m_Layer: 0 + m_Layer: 9 m_Name: forearm_fk_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3704,7 +3704,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 443100} - m_Layer: 0 + m_Layer: 9 m_Name: f_index_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3719,7 +3719,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 465524} - m_Layer: 0 + m_Layer: 9 m_Name: f_ring_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3734,7 +3734,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 484200} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_hose_parent_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3749,7 +3749,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 408624} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-heel_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3764,7 +3764,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 497196} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_middle_01_R_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3779,7 +3779,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 489554} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-forearm_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3794,7 +3794,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 479226} - m_Layer: 0 + m_Layer: 9 m_Name: VIS-upper_arm_pole_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3809,7 +3809,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 415154} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-head_001_socket2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3824,7 +3824,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 455430} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-thumb_01_L_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3839,7 +3839,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 444636} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-foot_L_roll_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3854,7 +3854,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 444524} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_index_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3869,7 +3869,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 437754} - m_Layer: 0 + m_Layer: 9 m_Name: f_ring_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3884,7 +3884,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 429044} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_pinky_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3899,7 +3899,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 486168} - m_Layer: 0 + m_Layer: 9 m_Name: f_index_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3914,7 +3914,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 462224} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-neck_child m_TagString: Untagged m_Icon: {fileID: 0} @@ -3929,7 +3929,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 486504} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_middle_01_L_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3944,7 +3944,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 499498} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hips_ik_ns_intr m_TagString: Untagged m_Icon: {fileID: 0} @@ -3959,7 +3959,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 415538} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shoulder_fk_ns_ch_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3974,7 +3974,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 406398} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_ring_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3989,7 +3989,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 400782} - m_Layer: 0 + m_Layer: 9 m_Name: upper_arm_hose_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4004,7 +4004,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 481160} - m_Layer: 0 + m_Layer: 9 m_Name: hand_fk_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4019,7 +4019,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 422148} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-knee_hose_parent_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4034,7 +4034,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 472606} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-head_002 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4049,7 +4049,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 409420} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shoulder_ik_ns_intr_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4064,7 +4064,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 477260} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hips_rh_ns_ch_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4079,7 +4079,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 413674} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_antistr_fk_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4094,7 +4094,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 492750} - m_Layer: 0 + m_Layer: 9 m_Name: thumb_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4109,7 +4109,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 482052} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_junc_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4124,7 +4124,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 402014} - m_Layer: 0 + m_Layer: 9 m_Name: f_pinky_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4139,7 +4139,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 464892} - m_Layer: 0 + m_Layer: 9 m_Name: f_middle_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4154,7 +4154,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 482966} - m_Layer: 0 + m_Layer: 9 m_Name: foot_fk_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4169,7 +4169,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 466040} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_pinky_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4184,7 +4184,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 472310} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thumb_01_R_tip m_TagString: Untagged m_Icon: {fileID: 0} @@ -4199,7 +4199,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 483464} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-upper_arm_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4214,7 +4214,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 469756} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-shin_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4229,7 +4229,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 497248} - m_Layer: 0 + m_Layer: 9 m_Name: spine m_TagString: Untagged m_Icon: {fileID: 0} @@ -4244,7 +4244,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 451914} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_index_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4259,7 +4259,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 482514} - m_Layer: 0 + m_Layer: 9 m_Name: f_index_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4277,7 +4277,7 @@ GameObject: - 95: {fileID: 9580064} - 54: {fileID: 5412682} - 136: {fileID: 13647710} - m_Layer: 0 + m_Layer: 9 m_Name: player m_TagString: Player m_Icon: {fileID: 0} @@ -4292,7 +4292,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 439036} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-foot_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4307,7 +4307,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 451502} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_middle_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4322,7 +4322,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 405668} - m_Layer: 0 + m_Layer: 9 m_Name: f_index_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4337,7 +4337,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 444556} - m_Layer: 0 + m_Layer: 9 m_Name: VIS-thigh_pole_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4352,7 +4352,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 403768} - m_Layer: 0 + m_Layer: 9 m_Name: f_middle_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4367,7 +4367,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 464000} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_pinky_01_L_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4382,7 +4382,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 478276} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shoulder_ik_ns_ch_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4397,7 +4397,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 453044} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hips_ik_ns_intr_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4412,7 +4412,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 452596} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-forearm_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4427,7 +4427,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 430012} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_middle_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4442,7 +4442,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 429696} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-palm_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4457,7 +4457,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 493052} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-neck_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4472,7 +4472,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 422598} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4487,7 +4487,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 463874} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hand_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4502,7 +4502,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 484850} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-toe_R_socket2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4517,7 +4517,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 474630} - m_Layer: 0 + m_Layer: 9 m_Name: thumb_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4532,7 +4532,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 419444} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hand_R_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4547,7 +4547,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 459988} - m_Layer: 0 + m_Layer: 9 m_Name: hand_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4562,7 +4562,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 493594} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_hose_parent_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4577,7 +4577,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 417960} - m_Layer: 0 + m_Layer: 9 m_Name: f_middle_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4592,7 +4592,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 428940} - m_Layer: 0 + m_Layer: 9 m_Name: VIS-thigh_pole_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4607,7 +4607,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 450846} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-palm_04_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4622,7 +4622,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 401484} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_pinky_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4637,7 +4637,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 480000} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_antistr_fk_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4652,7 +4652,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 471384} - m_Layer: 0 + m_Layer: 9 m_Name: f_pinky_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4667,7 +4667,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 454302} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_ring_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4682,7 +4682,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 474632} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_hose_parent_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4697,7 +4697,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 413212} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hips_ik_ns_ch_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4712,7 +4712,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 468828} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_stretch_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4727,7 +4727,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 405990} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shoulder_ik_ns_ch_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4742,7 +4742,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 492470} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_index_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4757,7 +4757,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 406108} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-head_001_socket1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4772,7 +4772,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 415998} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_index_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4787,7 +4787,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 440204} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-thumb_01_R_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4802,7 +4802,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 494336} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_ring_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4817,7 +4817,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 426506} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4832,7 +4832,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 428904} - m_Layer: 0 + m_Layer: 9 m_Name: f_middle_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4847,7 +4847,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 457018} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_antistr_fk_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4862,7 +4862,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 435070} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-palm_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4877,7 +4877,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 428152} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-foot_R_rocker_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4892,7 +4892,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 482948} - m_Layer: 0 + m_Layer: 9 m_Name: hand_fk_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -4907,7 +4907,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 485624} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-elbow_hose_parent_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4922,7 +4922,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 438686} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_pinky_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4937,7 +4937,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 414250} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-neck m_TagString: Untagged m_Icon: {fileID: 0} @@ -4952,7 +4952,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 453168} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_ring_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4967,7 +4967,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 459190} - m_Layer: 0 + m_Layer: 9 m_Name: f_index_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4982,7 +4982,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 426402} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-foot_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -4997,7 +4997,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 414718} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_index_01_L_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5012,7 +5012,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 479922} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_nostr_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5027,7 +5027,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 444782} - m_Layer: 0 + m_Layer: 9 m_Name: upper_arm_fk_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5042,7 +5042,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 438734} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_ring_01_L_tip m_TagString: Untagged m_Icon: {fileID: 0} @@ -5057,7 +5057,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 411958} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5072,7 +5072,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 443836} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hips_flex m_TagString: Untagged m_Icon: {fileID: 0} @@ -5087,7 +5087,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 478810} - m_Layer: 0 + m_Layer: 9 m_Name: thumb_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5102,7 +5102,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 492696} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_ring_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5117,7 +5117,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 482492} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thumb_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5132,7 +5132,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 485838} - m_Layer: 0 + m_Layer: 9 m_Name: elbow_target_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5147,7 +5147,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 452294} - m_Layer: 0 + m_Layer: 9 m_Name: neck m_TagString: Untagged m_Icon: {fileID: 0} @@ -5162,7 +5162,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 441062} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-upper_arm_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5177,7 +5177,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 456878} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_ring_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5192,7 +5192,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 434184} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hips_rh_ns_intr_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5207,7 +5207,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 459782} - m_Layer: 0 + m_Layer: 9 m_Name: f_pinky_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5222,7 +5222,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 407876} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_antistr_fk_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5237,7 +5237,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 481372} - m_Layer: 0 + m_Layer: 9 m_Name: f_middle_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5252,7 +5252,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 446316} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_index_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5267,7 +5267,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 437590} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thumb_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5282,7 +5282,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 430982} - m_Layer: 0 + m_Layer: 9 m_Name: f_middle_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5297,7 +5297,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 424218} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_ring_01_R_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5312,7 +5312,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 467362} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_antistr_fk_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5327,7 +5327,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 476554} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_index_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5342,7 +5342,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 464838} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_nostr_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5357,7 +5357,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 417862} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_middle_01_R_tip m_TagString: Untagged m_Icon: {fileID: 0} @@ -5372,7 +5372,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 449308} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_pinky_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5387,7 +5387,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 448278} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-toe_L_socket1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5402,7 +5402,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 475460} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-upper_arm_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5417,7 +5417,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 426732} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-toe_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5432,7 +5432,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 497564} - m_Layer: 0 + m_Layer: 9 m_Name: f_ring_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5447,7 +5447,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 473128} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-forearm_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5462,7 +5462,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 499668} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-chest_reverse m_TagString: Untagged m_Icon: {fileID: 0} @@ -5477,7 +5477,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 485066} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-head_002 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5492,7 +5492,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 435808} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thumb_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5507,7 +5507,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 483204} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shoulder_fk_ns_intr_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5522,7 +5522,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 419458} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-thigh_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5537,7 +5537,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 477174} - m_Layer: 0 + m_Layer: 9 m_Name: toe_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5552,7 +5552,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 458284} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_nostr_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5567,7 +5567,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 485160} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_stretch_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5582,7 +5582,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 441826} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_ring_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5597,7 +5597,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 492472} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_nostr_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5612,7 +5612,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 483520} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-shin_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5627,7 +5627,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 405252} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_pinky_01_L_tip m_TagString: Untagged m_Icon: {fileID: 0} @@ -5642,7 +5642,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 489116} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-shin_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5657,7 +5657,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 470478} - m_Layer: 0 + m_Layer: 9 m_Name: foot_roll_ik_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5672,7 +5672,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 417182} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-head m_TagString: Untagged m_Icon: {fileID: 0} @@ -5687,7 +5687,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 464270} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thigh_ik_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5702,7 +5702,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 491084} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_index_01_R_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5717,7 +5717,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 463652} - m_Layer: 0 + m_Layer: 9 m_Name: f_index_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5732,7 +5732,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 450346} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-foot_L_rocker_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5747,7 +5747,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 420858} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hips_flex_s m_TagString: Untagged m_Icon: {fileID: 0} @@ -5762,7 +5762,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 458802} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-thumb_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5777,7 +5777,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 427408} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_pinky_01_L_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5792,7 +5792,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 491260} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_ring_01_R_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5807,7 +5807,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 481166} - m_Layer: 0 + m_Layer: 9 m_Name: thigh_fk_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5822,7 +5822,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 460328} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_hose_parent_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5837,7 +5837,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 462202} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-thumb_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5869,7 +5869,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 499488} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-knee_hose_parent_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -5884,7 +5884,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 415086} - m_Layer: 0 + m_Layer: 9 m_Name: forearm_hose_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5899,7 +5899,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 484482} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-palm_04_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5914,7 +5914,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 460862} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-f_pinky_03_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5929,7 +5929,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 468784} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hips_fk_ns_intr m_TagString: Untagged m_Icon: {fileID: 0} @@ -5944,7 +5944,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 490920} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-spine m_TagString: Untagged m_Icon: {fileID: 0} @@ -5959,7 +5959,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 454864} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-foot_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5974,7 +5974,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 409520} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_smth_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -5989,7 +5989,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 431062} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-upper_arm_fk_L_socket2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -6004,7 +6004,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 462708} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-toe_L_socket2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -6019,7 +6019,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 400302} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_middle_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -6034,7 +6034,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 469692} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-chest_flex_s m_TagString: Untagged m_Icon: {fileID: 0} @@ -6049,7 +6049,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 435726} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_index_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -6064,7 +6064,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 431602} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-head m_TagString: Untagged m_Icon: {fileID: 0} @@ -6079,7 +6079,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 431964} - m_Layer: 0 + m_Layer: 9 m_Name: shin_hose_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -6094,7 +6094,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 434304} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-shin_smth_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -6109,7 +6109,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 471278} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-head_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -6124,7 +6124,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 421856} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-foot_R_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -6139,7 +6139,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 441900} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-foot_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -6154,7 +6154,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 478000} - m_Layer: 0 + m_Layer: 9 m_Name: thumb_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -6169,7 +6169,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 406650} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_middle_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -6184,7 +6184,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 463036} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-foot_R_rocker_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -6199,7 +6199,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 432270} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-thigh_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -6214,7 +6214,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 421558} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-hips_reverse m_TagString: Untagged m_Icon: {fileID: 0} @@ -6229,7 +6229,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 409728} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-head_005 m_TagString: Untagged m_Icon: {fileID: 0} @@ -6244,7 +6244,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 467730} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_middle_01_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -6259,7 +6259,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 477750} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-chest m_TagString: Untagged m_Icon: {fileID: 0} @@ -6274,7 +6274,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 432900} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_index_03_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -6289,7 +6289,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 481158} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-thumb_01_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -6304,7 +6304,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 406688} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-forearm_junc_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -6319,7 +6319,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 470312} - m_Layer: 0 + m_Layer: 9 m_Name: MCH-f_middle_01_L_tip m_TagString: Untagged m_Icon: {fileID: 0} @@ -6334,7 +6334,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 419384} - m_Layer: 0 + m_Layer: 9 m_Name: DEF-thumb_02_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -6349,7 +6349,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 480688} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-heel_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -6364,7 +6364,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 414326} - m_Layer: 0 + m_Layer: 9 m_Name: ORG-f_pinky_02_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -6379,7 +6379,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 448378} - m_Layer: 0 + m_Layer: 9 m_Name: rig m_TagString: Untagged m_Icon: {fileID: 0} @@ -6430,7 +6430,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 114060} - m_LocalRotation: {x: .705710769, y: .702811301, z: .0444106683, w: .0778220892} + m_LocalRotation: {x: .705710828, y: .70281136, z: .044410672, w: .0778220966} m_LocalPosition: {x: -.0369480252, y: .0380000249, z: .0822452083} m_LocalScale: {x: .999999702, y: 1, z: 1.00000012} m_Children: @@ -7975,7 +7975,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 151174} - m_LocalRotation: {x: .765582561, y: -.167002976, z: .403300554, w: .472590566} + m_LocalRotation: {x: .765582681, y: -.167002991, z: .403300613, w: .472590625} m_LocalPosition: {x: -.130635813, y: -.0356745422, z: -.206635743} m_LocalScale: {x: 1.00000012, y: 1.00000012, z: .999999881} m_Children: @@ -12238,7 +12238,7 @@ Prefab: objectReference: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} - target: {fileID: 0} propertyPath: m_Layer - value: 0 + value: 9 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} diff --git a/Assets/StriveGame/Res/View/GameWorldPanel.prefab b/Assets/StriveGame/Res/View/GameWorldPanel.prefab index ae26006..821df93 100644 --- a/Assets/StriveGame/Res/View/GameWorldPanel.prefab +++ b/Assets/StriveGame/Res/View/GameWorldPanel.prefab @@ -108,6 +108,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &121060 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22487164} + - 222: {fileID: 22265540} + - 114: {fileID: 11437034} + m_Layer: 5 + m_Name: Text_HP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &121146 GameObject: m_ObjectHideFlags: 1 @@ -125,6 +142,22 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &121698 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22421590} + - 114: {fileID: 11453058} + m_Layer: 5 + m_Name: Slider_HP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &122212 GameObject: m_ObjectHideFlags: 0 @@ -160,6 +193,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &126336 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22492748} + - 222: {fileID: 22222830} + - 114: {fileID: 11458810} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &126434 GameObject: m_ObjectHideFlags: 0 @@ -213,6 +263,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &130662 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22489792} + - 222: {fileID: 22230838} + - 114: {fileID: 11445874} + m_Layer: 5 + m_Name: Panel_PalyerHead + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 --- !u!1 &131602 GameObject: m_ObjectHideFlags: 1 @@ -540,6 +607,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &170380 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22427110} + - 222: {fileID: 22284698} + - 114: {fileID: 11427562} + m_Layer: 5 + m_Name: Text_PlayerName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &170608 GameObject: m_ObjectHideFlags: 0 @@ -593,6 +677,38 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &187850 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22442964} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &188298 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22471442} + - 222: {fileID: 22244938} + - 114: {fileID: 11415784} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &188616 GameObject: m_ObjectHideFlags: 0 @@ -700,11 +816,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -752,11 +868,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -817,7 +933,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -826,12 +942,13 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 + m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -857,11 +974,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -901,7 +1018,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -916,11 +1033,39 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 4 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5207\u6362" +--- !u!114 &11415784 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188298} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &11420812 MonoBehaviour: m_ObjectHideFlags: 1 @@ -971,7 +1116,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: .39199999} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -998,7 +1143,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1013,11 +1158,45 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 4 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u6CBB\u7597" +--- !u!114 &11427562 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 170380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u672A\u77E5\u751F\u7269" --- !u!114 &11428792 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1038,11 +1217,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -1082,7 +1261,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1091,12 +1270,13 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 + m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -1156,6 +1336,39 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &11437034 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 121060} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 100/100 --- !u!114 &11442554 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1168,7 +1381,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: .39199999} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1195,7 +1408,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1204,12 +1417,13 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 + m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -1235,11 +1449,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -1267,6 +1481,33 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &11445874 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 130662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &11446196 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1376,7 +1617,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1385,17 +1626,66 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 + m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u62FE\u53D6" +--- !u!114 &11453058 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 121698} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 22492748} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 100 + m_WholeNumbers: 0 + m_Value: 10 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &11453976 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1443,11 +1733,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -1495,11 +1785,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -1547,11 +1837,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -1579,6 +1869,33 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &11458810 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 126336} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9485294, g: 0.048821356, b: 0.048821356, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &11460118 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1618,7 +1935,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1633,6 +1950,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -1650,7 +1968,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: .5} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1665,6 +1983,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -1697,6 +2016,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 6 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 @@ -1714,7 +2034,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1729,6 +2049,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 4 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -1754,11 +2075,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -1798,7 +2119,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1807,12 +2128,13 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 + m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -1838,11 +2160,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -1864,19 +2186,23 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 0 m_CharacterLimit: 0 - m_EndEdit: + m_OnEndEdit: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_OnValueChange: + m_OnValueChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_SelectionColor: {r: .65882355, g: .807843149, b: 1, a: .752941191} + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} m_Text: - m_CaretBlinkRate: .850000024 + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 --- !u!114 &11469200 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1923,8 +2249,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1951,11 +2277,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -2003,11 +2329,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -2047,7 +2373,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2062,6 +2388,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 4 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -2121,9 +2448,9 @@ MonoBehaviour: m_Horizontal: 0 m_Vertical: 1 m_MovementType: 1 - m_Elasticity: .100000001 + m_Elasticity: 0.1 m_Inertia: 1 - m_DecelerationRate: .135000005 + m_DecelerationRate: 0.135 m_ScrollSensitivity: 1 m_Viewport: {fileID: 22483452} m_HorizontalScrollbar: {fileID: 0} @@ -2149,7 +2476,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2164,6 +2491,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 4 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -2223,6 +2551,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 1 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -2248,11 +2577,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -2292,7 +2621,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2307,6 +2636,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 4 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -2351,7 +2681,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2366,6 +2696,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 4 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -2383,7 +2714,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2398,6 +2729,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -2415,7 +2747,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2430,6 +2762,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -2503,11 +2836,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -2604,6 +2937,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 111386} +--- !u!222 &22222830 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 126336} --- !u!222 &22224518 CanvasRenderer: m_ObjectHideFlags: 1 @@ -2628,6 +2967,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 130298} +--- !u!222 &22230838 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 130662} --- !u!222 &22233932 CanvasRenderer: m_ObjectHideFlags: 1 @@ -2676,6 +3021,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 153570} +--- !u!222 &22244938 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188298} --- !u!222 &22248262 CanvasRenderer: m_ObjectHideFlags: 1 @@ -2712,6 +3063,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 169330} +--- !u!222 &22265540 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 121060} --- !u!222 &22266666 CanvasRenderer: m_ObjectHideFlags: 1 @@ -2766,6 +3123,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 151958} +--- !u!222 &22284698 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 170380} --- !u!222 &22289126 CanvasRenderer: m_ObjectHideFlags: 1 @@ -2793,8 +3156,10 @@ Canvas: m_ReceivesEvents: 1 m_OverrideSorting: 0 m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 m_SortingLayerID: 0 m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!224 &22400214 RectTransform: m_ObjectHideFlags: 1 @@ -2811,7 +3176,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22402788 RectTransform: m_ObjectHideFlags: 1 @@ -2824,11 +3189,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 22452346} m_RootOrder: 6 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 9.53674316e-07, y: 54.9999924} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.0000009536743, y: 54.999992} m_SizeDelta: {x: 387, y: 200} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22403676 RectTransform: m_ObjectHideFlags: 1 @@ -2845,7 +3210,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22405500 RectTransform: m_ObjectHideFlags: 1 @@ -2862,7 +3227,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22406016 RectTransform: m_ObjectHideFlags: 1 @@ -2876,11 +3241,11 @@ RectTransform: - {fileID: 22407814} m_Father: {fileID: 22452346} m_RootOrder: 8 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 50, y: 172} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 132, y: 180} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22407814 RectTransform: m_ObjectHideFlags: 1 @@ -2897,7 +3262,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22412938 RectTransform: m_ObjectHideFlags: 1 @@ -2914,7 +3279,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22416178 RectTransform: m_ObjectHideFlags: 1 @@ -2931,7 +3296,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: -1.52590001e-05} + m_SizeDelta: {x: 20, y: -0.000015259} m_Pivot: {x: 1, y: 1} --- !u!224 &22416802 RectTransform: @@ -2949,7 +3314,26 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &22421590 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 121698} + 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: + - {fileID: 22471442} + - {fileID: 22442964} + m_Father: {fileID: 22489792} + m_RootOrder: 1 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -10} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22424580 RectTransform: m_ObjectHideFlags: 1 @@ -2966,7 +3350,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22424880 RectTransform: m_ObjectHideFlags: 1 @@ -2980,11 +3364,11 @@ RectTransform: - {fileID: 22424580} m_Father: {fileID: 22452346} m_RootOrder: 10 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -50, y: 172} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 72, y: 180} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22426174 RectTransform: m_ObjectHideFlags: 1 @@ -2999,11 +3383,28 @@ RectTransform: - {fileID: 22457952} m_Father: {fileID: 22452346} m_RootOrder: 5 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -1.52587891e-05, y: 13} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.000015258789, y: 13} m_SizeDelta: {x: 150, y: 100} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &22427110 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 170380} + 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: 22489792} + m_RootOrder: 0 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 9} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22427760 RectTransform: m_ObjectHideFlags: 1 @@ -3020,7 +3421,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22431186 RectTransform: m_ObjectHideFlags: 1 @@ -3035,11 +3436,11 @@ RectTransform: - {fileID: 22416178} m_Father: {fileID: 22452346} m_RootOrder: 2 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -2, y: -128} - m_SizeDelta: {x: 221, y: 68.4000015} - m_Pivot: {x: .5, y: .5} + m_SizeDelta: {x: 221, y: 68.4} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22435452 RectTransform: m_ObjectHideFlags: 1 @@ -3053,11 +3454,11 @@ RectTransform: - {fileID: 22486490} m_Father: {fileID: 22452346} m_RootOrder: 9 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 5.24520874e-06, y: 172} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 102, y: 180} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22435984 RectTransform: m_ObjectHideFlags: 1 @@ -3072,9 +3473,27 @@ RectTransform: m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -.5} + m_AnchoredPosition: {x: 0, y: -0.5} m_SizeDelta: {x: -20, y: -13} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &22442964 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 187850} + 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: + - {fileID: 22492748} + m_Father: {fileID: 22421590} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22444150 RectTransform: m_ObjectHideFlags: 1 @@ -3088,11 +3507,11 @@ RectTransform: - {fileID: 22491866} m_Father: {fileID: 22452346} m_RootOrder: 15 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 233.000031, y: -153.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 233.00003, y: -153.5} m_SizeDelta: {x: 60, y: 60} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22449566 RectTransform: m_ObjectHideFlags: 1 @@ -3109,7 +3528,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22452346 RectTransform: m_ObjectHideFlags: 1 @@ -3136,6 +3555,7 @@ RectTransform: - {fileID: 22492072} - {fileID: 22499658} - {fileID: 22444150} + - {fileID: 22489792} m_Father: {fileID: 0} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} @@ -3157,9 +3577,9 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -.5} + m_AnchoredPosition: {x: 0, y: -0.5} m_SizeDelta: {x: -20, y: -13} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22457952 RectTransform: m_ObjectHideFlags: 1 @@ -3173,11 +3593,11 @@ RectTransform: - {fileID: 22400214} m_Father: {fileID: 22426174} m_RootOrder: 1 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 0, y: -65.0999985} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -65.1} m_SizeDelta: {x: 150, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22463098 RectTransform: m_ObjectHideFlags: 1 @@ -3191,11 +3611,11 @@ RectTransform: - {fileID: 22469648} m_Father: {fileID: 22452346} m_RootOrder: 7 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 100.000015, y: 172} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 162, y: 180.8} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22469648 RectTransform: m_ObjectHideFlags: 1 @@ -3212,7 +3632,24 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &22471442 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188298} + 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: 22421590} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: 4} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22473290 RectTransform: m_ObjectHideFlags: 1 @@ -3225,11 +3662,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 22426174} m_RootOrder: 0 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 0, y: 35.0000076} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 35.000008} m_SizeDelta: {x: 150, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22476650 RectTransform: m_ObjectHideFlags: 1 @@ -3238,16 +3675,16 @@ RectTransform: m_GameObject: {fileID: 170608} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.09057236, y: 1.09057212, z: 1.09057212} + m_LocalScale: {x: 1.0905724, y: 1.0905721, z: 1.0905721} m_Children: - {fileID: 22405500} m_Father: {fileID: 22452346} m_RootOrder: 11 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -335, y: -46.1469994} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -335, y: -75} m_SizeDelta: {x: 41, y: 29} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22477492 RectTransform: m_ObjectHideFlags: 1 @@ -3261,11 +3698,11 @@ RectTransform: - {fileID: 22403676} m_Father: {fileID: 22452346} m_RootOrder: 12 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 312.25, y: -30.0000153} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 312.25, y: -30.000015} m_SizeDelta: {x: 61.5, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22478766 RectTransform: m_ObjectHideFlags: 1 @@ -3273,17 +3710,17 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 133558} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 22427760} m_Father: {fileID: 22452346} m_RootOrder: 3 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 150, y: 172} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 192, y: 180} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22482252 RectTransform: m_ObjectHideFlags: 1 @@ -3296,11 +3733,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 22452346} m_RootOrder: 4 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 303, y: 111} m_SizeDelta: {x: 105, y: 26} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22482538 RectTransform: m_ObjectHideFlags: 1 @@ -3314,11 +3751,11 @@ RectTransform: - {fileID: 22449566} m_Father: {fileID: 22452346} m_RootOrder: 0 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 83, y: -178} - m_SizeDelta: {x: 50.2000008, y: 31.6000004} - m_Pivot: {x: .5, y: .5} + m_SizeDelta: {x: 50.2, y: 31.6} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22483332 RectTransform: m_ObjectHideFlags: 1 @@ -3336,7 +3773,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22483452 RectTransform: m_ObjectHideFlags: 1 @@ -3371,7 +3808,7 @@ RectTransform: m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22486490 RectTransform: m_ObjectHideFlags: 1 @@ -3388,7 +3825,44 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &22487164 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 121060} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -12} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 22489792} + m_RootOrder: 2 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 39, y: -18} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &22489792 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 130662} + 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: + - {fileID: 22427110} + - {fileID: 22421590} + - {fileID: 22487164} + m_Father: {fileID: 22452346} + m_RootOrder: 16 + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -268.5, y: -24} + m_SizeDelta: {x: -537, y: 45} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22491164 RectTransform: m_ObjectHideFlags: 1 @@ -3403,11 +3877,11 @@ RectTransform: - {fileID: 22435984} m_Father: {fileID: 22452346} m_RootOrder: 1 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -33, y: -178} m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22491866 RectTransform: m_ObjectHideFlags: 1 @@ -3424,7 +3898,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22492072 RectTransform: m_ObjectHideFlags: 1 @@ -3438,11 +3912,28 @@ RectTransform: - {fileID: 22412938} m_Father: {fileID: 22452346} m_RootOrder: 13 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 303, y: -144} m_SizeDelta: {x: 80, y: 79} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &22492748 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 126336} + 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: 22442964} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22494712 RectTransform: m_ObjectHideFlags: 1 @@ -3457,8 +3948,8 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -7.62939453e-06} - m_SizeDelta: {x: 0, y: 66.9899979} + m_AnchoredPosition: {x: 0, y: -0.0000076293945} + m_SizeDelta: {x: 0, y: 66.99} m_Pivot: {x: 0, y: 1} --- !u!224 &22499658 RectTransform: @@ -3473,11 +3964,11 @@ RectTransform: - {fileID: 22416802} m_Father: {fileID: 22452346} m_RootOrder: 14 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 312.25, y: -80.6470032} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 312.25, y: -80.647} m_SizeDelta: {x: 60, y: 60} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &100100000 Prefab: m_ObjectHideFlags: 1 diff --git a/Assets/StriveGame/Res/View/MessageBoxPanel.prefab b/Assets/StriveGame/Res/View/MessageBoxPanel.prefab new file mode 100644 index 0000000..c609b86 --- /dev/null +++ b/Assets/StriveGame/Res/View/MessageBoxPanel.prefab @@ -0,0 +1,664 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &117290 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22421182} + - 222: {fileID: 22299012} + - 114: {fileID: 11457588} + - 114: {fileID: 11461900} + m_Layer: 0 + m_Name: Button_OK + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &129542 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22496636} + - 222: {fileID: 22237462} + - 114: {fileID: 11406382} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &145368 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22406878} + - 222: {fileID: 22270948} + - 114: {fileID: 11428742} + - 114: {fileID: 11423206} + m_Layer: 0 + m_Name: Button_Cancle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &149860 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22498166} + - 222: {fileID: 22206630} + - 114: {fileID: 11475770} + m_Layer: 0 + m_Name: Text_Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &159406 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22459256} + - 222: {fileID: 22282274} + - 114: {fileID: 11488936} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &166242 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22467812} + - 222: {fileID: 22283120} + - 114: {fileID: 11485388} + m_Layer: 0 + m_Name: MessageBoxPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &189572 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22428800} + - 222: {fileID: 22212684} + - 114: {fileID: 11409612} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &192324 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22409848} + - 222: {fileID: 22201480} + - 114: {fileID: 11443986} + m_Layer: 0 + m_Name: Text_Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &11406382 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 129542} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 10 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 110 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u786E\u5B9A" +--- !u!114 &11409612 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 189572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 10 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u53D6\u6D88" +--- !u!114 &11423206 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 145368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 11428742} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &11428742 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 145368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11443986 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 192324} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6807\u9898" +--- !u!114 &11457588 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 117290} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11461900 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 117290} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 11457588} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &11475770 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 149860} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u63D0\u793A\u4FE1\u606F" +--- !u!114 &11485388 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 166242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11488936 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 159406} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &22201480 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 192324} +--- !u!222 &22206630 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 149860} +--- !u!222 &22212684 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 189572} +--- !u!222 &22237462 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 129542} +--- !u!222 &22270948 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 145368} +--- !u!222 &22282274 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 159406} +--- !u!222 &22283120 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 166242} +--- !u!222 &22299012 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 117290} +--- !u!224 &22406878 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 145368} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.81281936, y: 0.9843704, z: 1} + m_Children: + - {fileID: 22428800} + m_Father: {fileID: 22467812} + m_RootOrder: 2 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 38.8, y: -58.7} + m_SizeDelta: {x: 45, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &22409848 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 192324} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.99148786, y: 1.0588416, z: 1} + m_Children: [] + m_Father: {fileID: 22467812} + m_RootOrder: 3 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -5, y: 66.2} + m_SizeDelta: {x: 240, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &22421182 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 117290} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9043443, y: 1.0327119, z: 1} + m_Children: + - {fileID: 22496636} + m_Father: {fileID: 22467812} + m_RootOrder: 1 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -63, y: -59.6} + m_SizeDelta: {x: 45, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &22428800 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 189572} + 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: 22406878} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &22459256 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 159406} + 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: 22467812} + m_RootOrder: 0 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 260, y: 180} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &22467812 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 166242} + 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: + - {fileID: 22459256} + - {fileID: 22421182} + - {fileID: 22406878} + - {fileID: 22409848} + - {fileID: 22498166} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0.5} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &22496636 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 129542} + 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: 22421182} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &22498166 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 149860} + 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: 22467812} + m_RootOrder: 4 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -4, y: 2} + m_SizeDelta: {x: 240, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 166242} + m_IsPrefabParent: 1 diff --git a/Assets/StriveGame/Scenes/main.unity b/Assets/StriveGame/Scenes/main.unity index 56493bc..5fd8e7a 100644 --- a/Assets/StriveGame/Scenes/main.unity +++ b/Assets/StriveGame/Scenes/main.unity @@ -8,25 +8,25 @@ SceneSettings: m_PVSPortalsArray: [] m_OcclusionBakeSettings: smallestOccluder: 5 - smallestHole: .25 + smallestHole: 0.25 backfaceThreshold: 100 --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 6 m_Fog: 0 - m_FogColor: {r: .5, g: .5, b: .5, a: 1} + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 - m_FogDensity: .00999999978 + m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: .200000003, g: .200000003, b: .200000003, a: 1} - m_AmbientEquatorColor: {r: .200000003, g: .200000003, b: .200000003, a: 1} - m_AmbientGroundColor: {r: .200000003, g: .200000003, b: .200000003, a: 1} + m_AmbientSkyColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_AmbientEquatorColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_AmbientGroundColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 3 m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: .5 + m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 m_HaloTexture: {fileID: 0} @@ -40,7 +40,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 5 + serializedVersion: 6 m_GIWorkflowMode: 1 m_LightmapsMode: 1 m_GISettings: @@ -66,7 +66,7 @@ LightmapSettings: m_FinalGather: 0 m_FinalGatherRayCount: 1024 m_ReflectionCompression: 2 - m_LightmapSnapshot: {fileID: 0} + m_LightingDataAsset: {fileID: 0} m_RuntimeCPUUsage: 25 --- !u!196 &5 NavMeshSettings: @@ -74,17 +74,63 @@ NavMeshSettings: m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 - agentRadius: .5 + agentRadius: 0.5 agentHeight: 2 agentSlope: 45 - agentClimb: .400000006 + agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 accuratePlacement: 0 minRegionArea: 2 - cellSize: .166666657 + cellSize: 0.16666666 manualCellSize: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &202511985 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 400000, guid: 33f96eedfff0ffd43be808465075f6ba, type: 2} + propertyPath: m_LocalPosition.x + value: -112.199814 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 33f96eedfff0ffd43be808465075f6ba, type: 2} + propertyPath: m_LocalPosition.y + value: 156.62527 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 33f96eedfff0ffd43be808465075f6ba, type: 2} + propertyPath: m_LocalPosition.z + value: -0.08194733 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 33f96eedfff0ffd43be808465075f6ba, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 33f96eedfff0ffd43be808465075f6ba, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 33f96eedfff0ffd43be808465075f6ba, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 33f96eedfff0ffd43be808465075f6ba, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 33f96eedfff0ffd43be808465075f6ba, type: 2} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 11400000, guid: 33f96eedfff0ffd43be808465075f6ba, type: 2} + propertyPath: CanvasParent + value: + objectReference: {fileID: 347587868} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 33f96eedfff0ffd43be808465075f6ba, type: 2} + m_IsPrefabParent: 0 --- !u!1 &216123156 GameObject: m_ObjectHideFlags: 0 @@ -134,14 +180,14 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438} + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} m_NormalizedViewPortRect: serializedVersion: 2 x: 0 y: 0 width: 1 height: 1 - near clip plane: .300000012 + near clip plane: 0.3 far clip plane: 1000 field of view: 60 orthographic: 0 @@ -157,7 +203,7 @@ Camera: m_HDR: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 - m_StereoSeparation: .0219999999 + m_StereoSeparation: 0.022 m_StereoMirrorMode: 0 --- !u!4 &216123161 Transform: @@ -166,7 +212,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 216123156} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 68.5243835, y: 93.8657532, z: 12.3004456} + m_LocalPosition: {x: 68.52438, y: 93.86575, z: 12.300446} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -258,8 +304,10 @@ Canvas: m_ReceivesEvents: 1 m_OverrideSorting: 0 m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 m_SortingLayerID: 0 m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &379554406 GameObject: m_ObjectHideFlags: 0 @@ -306,7 +354,7 @@ MonoBehaviour: m_SubmitButton: Submit m_CancelButton: Cancel m_InputActionsPerSecond: 10 - m_RepeatDelay: .5 + m_RepeatDelay: 0.5 m_ForceModuleActive: 0 --- !u!114 &379554409 MonoBehaviour: @@ -417,7 +465,7 @@ MonoBehaviour: m_Bits: 0 StationnaryTolerance: 25 longTapTime: 1 - swipeTolerance: .850000024 + swipeTolerance: 0.85 minPinchLength: 0 minTwistAngle: 1 enabledNGuiMode: 0 @@ -434,7 +482,7 @@ MonoBehaviour: showGesture: 1 showTwoFinger: 1 showSecondFinger: 1 - secondFingerTexture: {fileID: 0} + secondFingerTexture: {fileID: 2800000, guid: 9cfeb5ae16bf3cc4084255c9ae7cf36f, type: 3} --- !u!4 &967952849 Transform: m_ObjectHideFlags: 0 @@ -481,8 +529,9 @@ Light: m_Type: 0 m_Resolution: -1 m_Strength: 1 - m_Bias: .0500000007 - m_NormalBias: .400000006 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -501,8 +550,8 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1366073067} - m_LocalRotation: {x: .408217937, y: -.234569728, z: .109381676, w: .875426054} - m_LocalPosition: {x: 0, y: 0, z: -27.5100002} + m_LocalRotation: {x: 0.40821794, y: -0.23456973, z: 0.109381676, w: 0.87542605} + m_LocalPosition: {x: 0, y: 0, z: -27.51} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -516,6 +565,7 @@ GameObject: m_Component: - 4: {fileID: 1485306845} - 114: {fileID: 1485306846} + - 143: {fileID: 1485306847} m_Layer: 0 m_Name: GameJoystick m_TagString: Untagged @@ -530,7 +580,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1485306844} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.81723022, y: -45.9748077, z: 48.1837311} + m_LocalPosition: {x: 2.8172302, y: -45.974808, z: 48.18373} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1754509425} @@ -555,12 +605,12 @@ MonoBehaviour: area: 0 joyAnchor: 7 joystickPositionOffset: {x: 0, y: 0} - zoneRadius: 100 - touchSize: 30 + zoneRadius: 71 + touchSize: 35 deadZone: 20 restrictArea: 0 resetFingerExit: 0 - interaction: 2 + interaction: 3 useBroadcast: 0 messageMode: 0 receiverGameObject: {fileID: 0} @@ -576,7 +626,7 @@ MonoBehaviour: clampXMax: 0 clampXMin: 0 enableXAutoStab: 0 - thresholdX: .00999999978 + thresholdX: 0.01 stabSpeedX: 20 enableYaxis: 1 yAxisTransform: {fileID: 0} @@ -589,7 +639,7 @@ MonoBehaviour: clampYMax: 0 clampYMin: 0 enableYAutoStab: 0 - thresholdY: .00999999978 + thresholdY: 0.01 stabSpeedY: 20 enableSmoothing: 0 smoothing: {x: 2, y: 2} @@ -608,6 +658,23 @@ MonoBehaviour: showInteraction: 1 showAppearance: 1 showPosition: 1 +--- !u!143 &1485306847 +CharacterController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1485306844} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Height: 2 + m_Radius: 0.5 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1594091349 GameObject: m_ObjectHideFlags: 0 @@ -682,7 +749,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1614297447} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 371.000946, y: 169.460724, z: 8.375} + m_LocalPosition: {x: 371.00095, y: 169.46072, z: 8.375} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -709,7 +776,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1754509424} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.81723022, y: 45.9748077, z: -48.1837311} + m_LocalPosition: {x: -2.8172302, y: 45.974808, z: -48.18373} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1485306845} diff --git a/Assets/StriveGame/Scripts/Common/LuaBehaviour.cs b/Assets/StriveGame/Scripts/Common/LuaBehaviour.cs index a6891c0..a2dca1e 100644 --- a/Assets/StriveGame/Scripts/Common/LuaBehaviour.cs +++ b/Assets/StriveGame/Scripts/Common/LuaBehaviour.cs @@ -18,6 +18,13 @@ protected void Start() { Util.CallMethod(name, "Start"); } + protected void Update() + { + LuaManager luaMgr = AppFacade.Instance.GetManager(ManagerName.Lua); + if (luaMgr == null) return; + if (null != luaMgr.lua.GetFunction(name + "." + "Tick",false)) + Util.CallMethod(name, "Tick"); + } protected void OnClick() { Util.CallMethod(name, "OnClick"); } diff --git a/Assets/StriveGame/Scripts/Common/LuaLoader.cs b/Assets/StriveGame/Scripts/Common/LuaLoader.cs index 616629c..6116cfc 100644 --- a/Assets/StriveGame/Scripts/Common/LuaLoader.cs +++ b/Assets/StriveGame/Scripts/Common/LuaLoader.cs @@ -31,7 +31,7 @@ public LuaLoader() { public void AddBundle(string bundleName) { string url = Util.DataPath + bundleName.ToLower(); if (File.Exists(url)) { - AssetBundle bundle = AssetBundle.CreateFromFile(url); + AssetBundle bundle = AssetBundle.LoadFromFile(url); if (bundle != null) { bundleName = bundleName.Replace("Lua/", ""); diff --git a/Assets/StriveGame/Scripts/EquipWeapon.cs b/Assets/StriveGame/Scripts/EquipWeapon.cs new file mode 100644 index 0000000..880d816 --- /dev/null +++ b/Assets/StriveGame/Scripts/EquipWeapon.cs @@ -0,0 +1,48 @@ +using UnityEngine; +using System.Collections; +using System.Collections.Generic; + +public class EquipWeapon : MonoBehaviour { + public Transform[] weapon; + public Transform weaponHand; + + private Transform currentweapon = null; + private Dictionary models = new Dictionary(); + bool isInit = false; + // Use this for initialization + void Start () { + init(); + } + void init() + { + models[6] = weapon[0]; + models[5] = weapon[1]; + models[9] = weapon[2]; + models[10] = weapon[3]; + isInit = true; + } + + public void equipWeapon(int wIndex) + { + if (!isInit) + init(); + clearWeapon(); + currentweapon = Instantiate(models[wIndex], weaponHand.position, + Quaternion.Euler(new Vector3(weaponHand.rotation.eulerAngles.x, weaponHand.rotation.eulerAngles.y, weaponHand.rotation.eulerAngles.z + 270))) as Transform; + currentweapon.parent = weaponHand; + } + + public void clearWeapon() + { + if (currentweapon != null) + { + currentweapon.parent = null; + Destroy(currentweapon.gameObject); + } + } + + void OnDestroy() + { + clearWeapon(); + } +} diff --git a/Assets/StriveGame/ToLua/Lua/math/Vector3.lua b/Assets/StriveGame/ToLua/Lua/math/Vector3.lua index f7ddfd3..06c48b6 100644 --- a/Assets/StriveGame/ToLua/Lua/math/Vector3.lua +++ b/Assets/StriveGame/ToLua/Lua/math/Vector3.lua @@ -3,7 +3,7 @@ -- All rights reserved. -- Use, modification and distribution are subject to the "MIT License" -------------------------------------------------------------------------------- - +local math = math local acos = math.acos local sqrt = math.sqrt local max = math.max @@ -16,14 +16,12 @@ local sign = Mathf.Sign local setmetatable = setmetatable local rawset = rawset local rawget = rawget +local type = type local rad2Deg = Mathf.Rad2Deg local deg2Rad = Mathf.Deg2Rad -local Vector3 = -{ -} - +local Vector3 = {} local get = tolua.initget(Vector3) Vector3.__index = function(t,k) @@ -40,17 +38,17 @@ Vector3.__index = function(t,k) return var end -Vector3.__call = function(t,x,y,z) - return Vector3.New(x,y,z) -end - function Vector3.New(x, y, z) local v = {x = x or 0, y = y or 0, z = z or 0} setmetatable(v, Vector3) return v end -local new = Vector3.New +local _new = Vector3.New + +Vector3.__call = function(t,x,y,z) + return _new(x,y,z) +end function Vector3:Set(x,y,z) self.x = x or 0 @@ -63,7 +61,7 @@ function Vector3:Get() end function Vector3:Clone() - return new(self.x, self.y, self.z) + return _new(self.x, self.y, self.z) end function Vector3.Distance(va, vb) @@ -76,7 +74,7 @@ end function Vector3.Lerp(from, to, t) t = clamp(t, 0, 1) - return new(from.x + (to.x - from.x) * t, from.y + (to.y - from.y) * t, from.z + (to.z - from.z) * t) + return _new(from.x + (to.x - from.x) * t, from.y + (to.y - from.y) * t, from.z + (to.z - from.z) * t) end function Vector3:Magnitude() @@ -84,11 +82,11 @@ function Vector3:Magnitude() end function Vector3.Max(lhs, rhs) - return new(max(lhs.x, rhs.x), max(lhs.y, rhs.y), max(lhs.z, rhs.z)) + return _new(max(lhs.x, rhs.x), max(lhs.y, rhs.y), max(lhs.z, rhs.z)) end function Vector3.Min(lhs, rhs) - return new(min(lhs.x, rhs.x), min(lhs.y, rhs.y), min(lhs.z, rhs.z)) + return _new(min(lhs.x, rhs.x), min(lhs.y, rhs.y), min(lhs.z, rhs.z)) end function Vector3.Normalize(v) @@ -96,10 +94,10 @@ function Vector3.Normalize(v) local num = sqrt(x * x + y * y + z * z) if num > 1e-5 then - return new(x/num, y/num, z/num) + return _new(x/num, y/num, z/num) end - return new(0, 0, 0) + return _new(0, 0, 0) end function Vector3:SetNormalize() @@ -254,7 +252,7 @@ end local overSqrt2 = 0.7071067811865475244008443621048490 local function OrthoNormalVector(vec) - local res = Vector3.New() + local res = _new() if abs(vec.z) > overSqrt2 then local a = vec.y * vec.y + vec.z * vec.z @@ -334,14 +332,14 @@ function Vector3.Scale(a, b) local x = a.x * b.x local y = a.y * b.y local z = a.z * b.z - return new(x, y, z) + return _new(x, y, z) end function Vector3.Cross(lhs, rhs) local x = lhs.y * rhs.z - lhs.z * rhs.y local y = lhs.z * rhs.x - lhs.x * rhs.z local z = lhs.x * rhs.y - lhs.y * rhs.x - return Vector3.New(x,y,z) + return _new(x,y,z) end function Vector3:Equals(other) @@ -360,7 +358,7 @@ function Vector3.Project(vector, onNormal) local num = onNormal:SqrMagnitude() if num < 1.175494e-38 then - return Vector3.New(0,0,0) + return _new(0,0,0) end local num2 = dot(vector, onNormal) @@ -484,12 +482,12 @@ Vector3.__tostring = function(self) end Vector3.__div = function(va, d) - return Vector3.New(va.x / d, va.y / d, va.z / d) + return _new(va.x / d, va.y / d, va.z / d) end Vector3.__mul = function(va, d) if type(d) == "number" then - return Vector3.New(va.x * d, va.y * d, va.z * d) + return _new(va.x * d, va.y * d, va.z * d) else local vec = va:Clone() vec:MulQuat(d) @@ -498,15 +496,15 @@ Vector3.__mul = function(va, d) end Vector3.__add = function(va, vb) - return Vector3.New(va.x + vb.x, va.y + vb.y, va.z + vb.z) + return _new(va.x + vb.x, va.y + vb.y, va.z + vb.z) end Vector3.__sub = function(va, vb) - return Vector3.New(va.x - vb.x, va.y - vb.y, va.z - vb.z) + return _new(va.x - vb.x, va.y - vb.y, va.z - vb.z) end Vector3.__unm = function(va) - return Vector3.New(-va.x, -va.y, -va.z) + return _new(-va.x, -va.y, -va.z) end Vector3.__eq = function(a,b) @@ -515,18 +513,19 @@ Vector3.__eq = function(a,b) return delta < 1e-10 end -get.up = function() return Vector3.New(0,1,0) end -get.down = function() return Vector3.New(0,-1,0) end -get.right = function() return Vector3.New(1,0,0) end -get.left = function() return Vector3.New(-1,0,0) end -get.forward = function() return Vector3.New(0,0,1) end -get.back = function() return Vector3.New(0,0,-1) end -get.zero = function() return Vector3.New(0,0,0) end -get.one = function() return Vector3.New(1,1,1) end +get.up = function() return _new(0,1,0) end +get.down = function() return _new(0,-1,0) end +get.right = function() return _new(1,0,0) end +get.left = function() return _new(-1,0,0) end +get.forward = function() return _new(0,0,1) end +get.back = function() return _new(0,0,-1) end +get.zero = function() return _new(0,0,0) end +get.one = function() return _new(1,1,1) end get.magnitude = Vector3.Magnitude get.normalized = Vector3.Normalize get.sqrMagnitude= Vector3.SqrMagnitude +UnityEngine.Vector3 = Vector3 setmetatable(Vector3, Vector3) return Vector3 diff --git a/Assets/StriveGame/ToLua/Source/Generate/DelegateFactory.cs b/Assets/StriveGame/ToLua/Source/Generate/DelegateFactory.cs index 1c4c247..182c625 100644 --- a/Assets/StriveGame/ToLua/Source/Generate/DelegateFactory.cs +++ b/Assets/StriveGame/ToLua/Source/Generate/DelegateFactory.cs @@ -1,23 +1,42 @@ -//this source code was auto-generated by tolua#, do not modify it -using System; -using System.Collections.Generic; -using LuaInterface; - -public static class DelegateFactory -{ - delegate Delegate DelegateValue(LuaFunction func); - static Dictionary dict = new Dictionary(); - - static DelegateFactory() - { - Register(); - } - - [NoToLuaAttribute] - public static void Register() - { - dict.Clear(); - } +//this source code was auto-generated by tolua#, do not modify it +using System; +using System.Collections.Generic; +using LuaInterface; + +public static class DelegateFactory +{ + delegate Delegate DelegateValue(LuaFunction func); + static Dictionary dict = new Dictionary(); + + static DelegateFactory() + { + Register(); + } + + [NoToLuaAttribute] + public static void Register() + { + dict.Clear(); + dict.Add(typeof(System.Action), System_Action); + dict.Add(typeof(UnityEngine.Events.UnityAction), UnityEngine_Events_UnityAction); + dict.Add(typeof(UnityEngine.Application.LogCallback), UnityEngine_Application_LogCallback); + dict.Add(typeof(UnityEngine.Application.AdvertisingIdentifierCallback), UnityEngine_Application_AdvertisingIdentifierCallback); + dict.Add(typeof(UnityEngine.Camera.CameraCallback), UnityEngine_Camera_CameraCallback); + dict.Add(typeof(UnityEngine.AudioClip.PCMReaderCallback), UnityEngine_AudioClip_PCMReaderCallback); + dict.Add(typeof(UnityEngine.AudioClip.PCMSetPositionCallback), UnityEngine_AudioClip_PCMSetPositionCallback); + dict.Add(typeof(UnityEngine.RectTransform.ReapplyDrivenProperties), UnityEngine_RectTransform_ReapplyDrivenProperties); + dict.Add(typeof(UnityEngine.UI.InputField.OnValidateInput), UnityEngine_UI_InputField_OnValidateInput); + dict.Add(typeof(System.Action), System_Action_NotiData); + dict.Add(typeof(System.Action), System_Action_UnityEngine_Objects); + dict.Add(typeof(KBEngine.NetworkInterface.ConnectCallback), KBEngine_NetworkInterface_ConnectCallback); + dict.Add(typeof(EasyJoystick.JoystickMoveStartHandler), EasyJoystick_JoystickMoveStartHandler); + dict.Add(typeof(EasyJoystick.JoystickMoveHandler), EasyJoystick_JoystickMoveHandler); + dict.Add(typeof(EasyJoystick.JoystickMoveEndHandler), EasyJoystick_JoystickMoveEndHandler); + dict.Add(typeof(EasyJoystick.JoystickTouchStartHandler), EasyJoystick_JoystickTouchStartHandler); + dict.Add(typeof(EasyJoystick.JoystickTapHandler), EasyJoystick_JoystickTapHandler); + dict.Add(typeof(EasyJoystick.JoystickDoubleTapHandler), EasyJoystick_JoystickDoubleTapHandler); + dict.Add(typeof(EasyJoystick.JoystickTouchUpHandler), EasyJoystick_JoystickTouchUpHandler); + } [NoToLuaAttribute] public static Delegate CreateDelegate(Type t, LuaFunction func = null) @@ -52,6 +71,486 @@ public static Delegate RemoveDelegate(Delegate obj, LuaFunction func) return obj; } - -} - + + class System_Action_Event : LuaDelegate + { + public System_Action_Event(LuaFunction func) : base(func) { } + + public void Call() + { + func.Call(); + } + } + + public static Delegate System_Action(LuaFunction func) + { + if (func == null) + { + System.Action fn = delegate { }; + return fn; + } + + System.Action d = (new System_Action_Event(func)).Call; + return d; + } + + class UnityEngine_Events_UnityAction_Event : LuaDelegate + { + public UnityEngine_Events_UnityAction_Event(LuaFunction func) : base(func) { } + + public void Call() + { + func.Call(); + } + } + + public static Delegate UnityEngine_Events_UnityAction(LuaFunction func) + { + if (func == null) + { + UnityEngine.Events.UnityAction fn = delegate { }; + return fn; + } + + UnityEngine.Events.UnityAction d = (new UnityEngine_Events_UnityAction_Event(func)).Call; + return d; + } + + class UnityEngine_Application_LogCallback_Event : LuaDelegate + { + public UnityEngine_Application_LogCallback_Event(LuaFunction func) : base(func) { } + + public void Call(string param0,string param1,UnityEngine.LogType param2) + { + func.BeginPCall(); + func.Push(param0); + func.Push(param1); + func.Push(param2); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate UnityEngine_Application_LogCallback(LuaFunction func) + { + if (func == null) + { + UnityEngine.Application.LogCallback fn = delegate { }; + return fn; + } + + UnityEngine.Application.LogCallback d = (new UnityEngine_Application_LogCallback_Event(func)).Call; + return d; + } + + class UnityEngine_Application_AdvertisingIdentifierCallback_Event : LuaDelegate + { + public UnityEngine_Application_AdvertisingIdentifierCallback_Event(LuaFunction func) : base(func) { } + + public void Call(string param0,bool param1,string param2) + { + func.BeginPCall(); + func.Push(param0); + func.Push(param1); + func.Push(param2); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate UnityEngine_Application_AdvertisingIdentifierCallback(LuaFunction func) + { + if (func == null) + { + UnityEngine.Application.AdvertisingIdentifierCallback fn = delegate { }; + return fn; + } + + UnityEngine.Application.AdvertisingIdentifierCallback d = (new UnityEngine_Application_AdvertisingIdentifierCallback_Event(func)).Call; + return d; + } + + class UnityEngine_Camera_CameraCallback_Event : LuaDelegate + { + public UnityEngine_Camera_CameraCallback_Event(LuaFunction func) : base(func) { } + + public void Call(UnityEngine.Camera param0) + { + func.BeginPCall(); + func.Push(param0); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate UnityEngine_Camera_CameraCallback(LuaFunction func) + { + if (func == null) + { + UnityEngine.Camera.CameraCallback fn = delegate { }; + return fn; + } + + UnityEngine.Camera.CameraCallback d = (new UnityEngine_Camera_CameraCallback_Event(func)).Call; + return d; + } + + class UnityEngine_AudioClip_PCMReaderCallback_Event : LuaDelegate + { + public UnityEngine_AudioClip_PCMReaderCallback_Event(LuaFunction func) : base(func) { } + + public void Call(float[] param0) + { + func.BeginPCall(); + func.Push(param0); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate UnityEngine_AudioClip_PCMReaderCallback(LuaFunction func) + { + if (func == null) + { + UnityEngine.AudioClip.PCMReaderCallback fn = delegate { }; + return fn; + } + + UnityEngine.AudioClip.PCMReaderCallback d = (new UnityEngine_AudioClip_PCMReaderCallback_Event(func)).Call; + return d; + } + + class UnityEngine_AudioClip_PCMSetPositionCallback_Event : LuaDelegate + { + public UnityEngine_AudioClip_PCMSetPositionCallback_Event(LuaFunction func) : base(func) { } + + public void Call(int param0) + { + func.BeginPCall(); + func.Push(param0); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate UnityEngine_AudioClip_PCMSetPositionCallback(LuaFunction func) + { + if (func == null) + { + UnityEngine.AudioClip.PCMSetPositionCallback fn = delegate { }; + return fn; + } + + UnityEngine.AudioClip.PCMSetPositionCallback d = (new UnityEngine_AudioClip_PCMSetPositionCallback_Event(func)).Call; + return d; + } + + class UnityEngine_RectTransform_ReapplyDrivenProperties_Event : LuaDelegate + { + public UnityEngine_RectTransform_ReapplyDrivenProperties_Event(LuaFunction func) : base(func) { } + + public void Call(UnityEngine.RectTransform param0) + { + func.BeginPCall(); + func.Push(param0); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate UnityEngine_RectTransform_ReapplyDrivenProperties(LuaFunction func) + { + if (func == null) + { + UnityEngine.RectTransform.ReapplyDrivenProperties fn = delegate { }; + return fn; + } + + UnityEngine.RectTransform.ReapplyDrivenProperties d = (new UnityEngine_RectTransform_ReapplyDrivenProperties_Event(func)).Call; + return d; + } + + class UnityEngine_UI_InputField_OnValidateInput_Event : LuaDelegate + { + public UnityEngine_UI_InputField_OnValidateInput_Event(LuaFunction func) : base(func) { } + + public char Call(string param0,int param1,char param2) + { + func.BeginPCall(); + func.Push(param0); + func.Push(param1); + func.Push(param2); + func.PCall(); + char ret = (char)func.CheckNumber(); + func.EndPCall(); + return ret; + } + } + + public static Delegate UnityEngine_UI_InputField_OnValidateInput(LuaFunction func) + { + if (func == null) + { + UnityEngine.UI.InputField.OnValidateInput fn = delegate { return '\0'; }; + return fn; + } + + UnityEngine.UI.InputField.OnValidateInput d = (new UnityEngine_UI_InputField_OnValidateInput_Event(func)).Call; + return d; + } + + class System_Action_NotiData_Event : LuaDelegate + { + public System_Action_NotiData_Event(LuaFunction func) : base(func) { } + + public void Call(NotiData param0) + { + func.BeginPCall(); + func.PushObject(param0); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate System_Action_NotiData(LuaFunction func) + { + if (func == null) + { + System.Action fn = delegate { }; + return fn; + } + + System.Action d = (new System_Action_NotiData_Event(func)).Call; + return d; + } + + class System_Action_UnityEngine_Objects_Event : LuaDelegate + { + public System_Action_UnityEngine_Objects_Event(LuaFunction func) : base(func) { } + + public void Call(UnityEngine.Object[] param0) + { + func.BeginPCall(); + func.Push(param0); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate System_Action_UnityEngine_Objects(LuaFunction func) + { + if (func == null) + { + System.Action fn = delegate { }; + return fn; + } + + System.Action d = (new System_Action_UnityEngine_Objects_Event(func)).Call; + return d; + } + + class KBEngine_NetworkInterface_ConnectCallback_Event : LuaDelegate + { + public KBEngine_NetworkInterface_ConnectCallback_Event(LuaFunction func) : base(func) { } + + public void Call(string param0,int param1,bool param2,object param3) + { + func.BeginPCall(); + func.Push(param0); + func.Push(param1); + func.Push(param2); + func.Push(param3); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate KBEngine_NetworkInterface_ConnectCallback(LuaFunction func) + { + if (func == null) + { + KBEngine.NetworkInterface.ConnectCallback fn = delegate { }; + return fn; + } + + KBEngine.NetworkInterface.ConnectCallback d = (new KBEngine_NetworkInterface_ConnectCallback_Event(func)).Call; + return d; + } + + class EasyJoystick_JoystickMoveStartHandler_Event : LuaDelegate + { + public EasyJoystick_JoystickMoveStartHandler_Event(LuaFunction func) : base(func) { } + + public void Call(MovingJoystick param0) + { + func.BeginPCall(); + func.PushObject(param0); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate EasyJoystick_JoystickMoveStartHandler(LuaFunction func) + { + if (func == null) + { + EasyJoystick.JoystickMoveStartHandler fn = delegate { }; + return fn; + } + + EasyJoystick.JoystickMoveStartHandler d = (new EasyJoystick_JoystickMoveStartHandler_Event(func)).Call; + return d; + } + + class EasyJoystick_JoystickMoveHandler_Event : LuaDelegate + { + public EasyJoystick_JoystickMoveHandler_Event(LuaFunction func) : base(func) { } + + public void Call(MovingJoystick param0) + { + func.BeginPCall(); + func.PushObject(param0); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate EasyJoystick_JoystickMoveHandler(LuaFunction func) + { + if (func == null) + { + EasyJoystick.JoystickMoveHandler fn = delegate { }; + return fn; + } + + EasyJoystick.JoystickMoveHandler d = (new EasyJoystick_JoystickMoveHandler_Event(func)).Call; + return d; + } + + class EasyJoystick_JoystickMoveEndHandler_Event : LuaDelegate + { + public EasyJoystick_JoystickMoveEndHandler_Event(LuaFunction func) : base(func) { } + + public void Call(MovingJoystick param0) + { + func.BeginPCall(); + func.PushObject(param0); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate EasyJoystick_JoystickMoveEndHandler(LuaFunction func) + { + if (func == null) + { + EasyJoystick.JoystickMoveEndHandler fn = delegate { }; + return fn; + } + + EasyJoystick.JoystickMoveEndHandler d = (new EasyJoystick_JoystickMoveEndHandler_Event(func)).Call; + return d; + } + + class EasyJoystick_JoystickTouchStartHandler_Event : LuaDelegate + { + public EasyJoystick_JoystickTouchStartHandler_Event(LuaFunction func) : base(func) { } + + public void Call(MovingJoystick param0) + { + func.BeginPCall(); + func.PushObject(param0); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate EasyJoystick_JoystickTouchStartHandler(LuaFunction func) + { + if (func == null) + { + EasyJoystick.JoystickTouchStartHandler fn = delegate { }; + return fn; + } + + EasyJoystick.JoystickTouchStartHandler d = (new EasyJoystick_JoystickTouchStartHandler_Event(func)).Call; + return d; + } + + class EasyJoystick_JoystickTapHandler_Event : LuaDelegate + { + public EasyJoystick_JoystickTapHandler_Event(LuaFunction func) : base(func) { } + + public void Call(MovingJoystick param0) + { + func.BeginPCall(); + func.PushObject(param0); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate EasyJoystick_JoystickTapHandler(LuaFunction func) + { + if (func == null) + { + EasyJoystick.JoystickTapHandler fn = delegate { }; + return fn; + } + + EasyJoystick.JoystickTapHandler d = (new EasyJoystick_JoystickTapHandler_Event(func)).Call; + return d; + } + + class EasyJoystick_JoystickDoubleTapHandler_Event : LuaDelegate + { + public EasyJoystick_JoystickDoubleTapHandler_Event(LuaFunction func) : base(func) { } + + public void Call(MovingJoystick param0) + { + func.BeginPCall(); + func.PushObject(param0); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate EasyJoystick_JoystickDoubleTapHandler(LuaFunction func) + { + if (func == null) + { + EasyJoystick.JoystickDoubleTapHandler fn = delegate { }; + return fn; + } + + EasyJoystick.JoystickDoubleTapHandler d = (new EasyJoystick_JoystickDoubleTapHandler_Event(func)).Call; + return d; + } + + class EasyJoystick_JoystickTouchUpHandler_Event : LuaDelegate + { + public EasyJoystick_JoystickTouchUpHandler_Event(LuaFunction func) : base(func) { } + + public void Call(MovingJoystick param0) + { + func.BeginPCall(); + func.PushObject(param0); + func.PCall(); + func.EndPCall(); + } + } + + public static Delegate EasyJoystick_JoystickTouchUpHandler(LuaFunction func) + { + if (func == null) + { + EasyJoystick.JoystickTouchUpHandler fn = delegate { }; + return fn; + } + + EasyJoystick.JoystickTouchUpHandler d = (new EasyJoystick_JoystickTouchUpHandler_Event(func)).Call; + return d; + } + +} + diff --git a/Assets/StriveGame/ToLua/Source/Generate/LuaBinder.cs b/Assets/StriveGame/ToLua/Source/Generate/LuaBinder.cs index 74adab0..08361ea 100644 --- a/Assets/StriveGame/ToLua/Source/Generate/LuaBinder.cs +++ b/Assets/StriveGame/ToLua/Source/Generate/LuaBinder.cs @@ -1,10 +1,470 @@ -using System; -using LuaInterface; - -public static class LuaBinder -{ - public static void Bind(LuaState L) - { - throw new LuaException("Please generate LuaBinder files first!"); - } -} +//this source code was auto-generated by tolua#, do not modify it +using System; +using UnityEngine; +using LuaInterface; + +public static class LuaBinder +{ + public static void Bind(LuaState L) + { + float t = Time.realtimeSinceStartup; + L.BeginModule(null); + DebuggerWrap.Register(L); + EasyJoystickWrap.Register(L); + MovingJoystickWrap.Register(L); + NcEffectFlyingWrap.Register(L); + bl_HUDTextWrap.Register(L); + ViewWrap.Register(L); + BaseWrap.Register(L); + ManagerWrap.Register(L); + L.BeginModule("UnityEngine"); + UnityEngine_ComponentWrap.Register(L); + UnityEngine_BehaviourWrap.Register(L); + UnityEngine_MonoBehaviourWrap.Register(L); + UnityEngine_GameObjectWrap.Register(L); + UnityEngine_TransformWrap.Register(L); + UnityEngine_TrackedReferenceWrap.Register(L); + UnityEngine_ApplicationWrap.Register(L); + UnityEngine_PhysicsWrap.Register(L); + UnityEngine_ColliderWrap.Register(L); + UnityEngine_TimeWrap.Register(L); + UnityEngine_TextureWrap.Register(L); + UnityEngine_Texture2DWrap.Register(L); + UnityEngine_ShaderWrap.Register(L); + UnityEngine_MaterialWrap.Register(L); + UnityEngine_RendererWrap.Register(L); + UnityEngine_WWWWrap.Register(L); + UnityEngine_ScreenWrap.Register(L); + UnityEngine_CameraWrap.Register(L); + UnityEngine_CameraClearFlagsWrap.Register(L); + UnityEngine_AudioClipWrap.Register(L); + UnityEngine_AudioSourceWrap.Register(L); + UnityEngine_AssetBundleWrap.Register(L); + UnityEngine_ParticleSystemWrap.Register(L); + UnityEngine_AsyncOperationWrap.Register(L); + UnityEngine_LightWrap.Register(L); + UnityEngine_LightTypeWrap.Register(L); + UnityEngine_SleepTimeoutWrap.Register(L); + UnityEngine_AnimatorWrap.Register(L); + UnityEngine_InputWrap.Register(L); + UnityEngine_KeyCodeWrap.Register(L); + UnityEngine_SkinnedMeshRendererWrap.Register(L); + UnityEngine_SpaceWrap.Register(L); + UnityEngine_AnimationBlendModeWrap.Register(L); + UnityEngine_QueueModeWrap.Register(L); + UnityEngine_PlayModeWrap.Register(L); + UnityEngine_WrapModeWrap.Register(L); + UnityEngine_QualitySettingsWrap.Register(L); + UnityEngine_RenderSettingsWrap.Register(L); + UnityEngine_RectTransformWrap.Register(L); + L.BeginModule("UI"); + UnityEngine_UI_TextWrap.Register(L); + UnityEngine_UI_InputFieldWrap.Register(L); + UnityEngine_UI_ToggleWrap.Register(L); + UnityEngine_UI_ScrollbarWrap.Register(L); + UnityEngine_UI_SliderWrap.Register(L); + L.EndModule(); + L.BeginModule("Experimental"); + L.BeginModule("Director"); + UnityEngine_Experimental_Director_DirectorPlayerWrap.Register(L); + L.EndModule(); + L.EndModule(); + L.BeginModule("Events"); + L.RegFunction("UnityAction", UnityEngine_Events_UnityAction); + L.EndModule(); + L.EndModule(); + L.BeginModule("LuaFramework"); + LuaFramework_UtilWrap.Register(L); + LuaFramework_AppConstWrap.Register(L); + LuaFramework_LuaHelperWrap.Register(L); + LuaFramework_LuaBehaviourWrap.Register(L); + LuaFramework_GameManagerWrap.Register(L); + LuaFramework_LuaManagerWrap.Register(L); + LuaFramework_PanelManagerWrap.Register(L); + LuaFramework_SoundManagerWrap.Register(L); + LuaFramework_TimerManagerWrap.Register(L); + LuaFramework_ThreadManagerWrap.Register(L); + LuaFramework_ResourceManagerWrap.Register(L); + L.EndModule(); + L.BeginModule("KBEngine"); + KBEngine_EventWrap.Register(L); + KBEngine_NetworkInterfaceWrap.Register(L); + KBEngine_MemoryStreamWrap.Register(L); + KBEngine_PersistentInofsWrap.Register(L); + L.EndModule(); + L.BeginModule("System"); + L.RegFunction("Action", System_Action); + L.RegFunction("Action_NotiData", System_Action_NotiData); + L.RegFunction("Action_UnityEngine_Objects", System_Action_UnityEngine_Objects); + L.EndModule(); + L.EndModule(); + L.BeginPreLoad(); + L.AddPreLoad("UnityEngine.MeshRenderer", LuaOpen_UnityEngine_MeshRenderer, typeof(UnityEngine.MeshRenderer)); + L.AddPreLoad("UnityEngine.ParticleEmitter", LuaOpen_UnityEngine_ParticleEmitter, typeof(UnityEngine.ParticleEmitter)); + L.AddPreLoad("UnityEngine.ParticleRenderer", LuaOpen_UnityEngine_ParticleRenderer, typeof(UnityEngine.ParticleRenderer)); + L.AddPreLoad("UnityEngine.ParticleAnimator", LuaOpen_UnityEngine_ParticleAnimator, typeof(UnityEngine.ParticleAnimator)); + L.AddPreLoad("UnityEngine.BoxCollider", LuaOpen_UnityEngine_BoxCollider, typeof(UnityEngine.BoxCollider)); + L.AddPreLoad("UnityEngine.MeshCollider", LuaOpen_UnityEngine_MeshCollider, typeof(UnityEngine.MeshCollider)); + L.AddPreLoad("UnityEngine.SphereCollider", LuaOpen_UnityEngine_SphereCollider, typeof(UnityEngine.SphereCollider)); + L.AddPreLoad("UnityEngine.CharacterController", LuaOpen_UnityEngine_CharacterController, typeof(UnityEngine.CharacterController)); + L.AddPreLoad("UnityEngine.CapsuleCollider", LuaOpen_UnityEngine_CapsuleCollider, typeof(UnityEngine.CapsuleCollider)); + L.AddPreLoad("UnityEngine.Animation", LuaOpen_UnityEngine_Animation, typeof(UnityEngine.Animation)); + L.AddPreLoad("UnityEngine.AnimationClip", LuaOpen_UnityEngine_AnimationClip, typeof(UnityEngine.AnimationClip)); + L.AddPreLoad("UnityEngine.AnimationState", LuaOpen_UnityEngine_AnimationState, typeof(UnityEngine.AnimationState)); + L.AddPreLoad("UnityEngine.BlendWeights", LuaOpen_UnityEngine_BlendWeights, typeof(UnityEngine.BlendWeights)); + L.AddPreLoad("UnityEngine.RenderTexture", LuaOpen_UnityEngine_RenderTexture, typeof(UnityEngine.RenderTexture)); + L.AddPreLoad("UnityEngine.Rigidbody", LuaOpen_UnityEngine_Rigidbody, typeof(UnityEngine.Rigidbody)); + L.EndPreLoad(); + Debugger.Log("Register lua type cost time: {0}", Time.realtimeSinceStartup - t); + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int UnityEngine_Events_UnityAction(IntPtr L) + { + try + { + LuaFunction func = ToLua.CheckLuaFunction(L, 1); + Delegate arg1 = DelegateFactory.CreateDelegate(typeof(UnityEngine.Events.UnityAction), func); + ToLua.Push(L, arg1); + return 1; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int System_Action(IntPtr L) + { + try + { + LuaFunction func = ToLua.CheckLuaFunction(L, 1); + Delegate arg1 = DelegateFactory.CreateDelegate(typeof(System.Action), func); + ToLua.Push(L, arg1); + return 1; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int System_Action_NotiData(IntPtr L) + { + try + { + LuaFunction func = ToLua.CheckLuaFunction(L, 1); + Delegate arg1 = DelegateFactory.CreateDelegate(typeof(System.Action), func); + ToLua.Push(L, arg1); + return 1; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int System_Action_UnityEngine_Objects(IntPtr L) + { + try + { + LuaFunction func = ToLua.CheckLuaFunction(L, 1); + Delegate arg1 = DelegateFactory.CreateDelegate(typeof(System.Action), func); + ToLua.Push(L, arg1); + return 1; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LuaOpen_UnityEngine_MeshRenderer(IntPtr L) + { + try + { + int top = LuaDLL.lua_gettop(L); + LuaState state = LuaState.Get(L); + int preTop = state.BeginPreModule("UnityEngine"); + UnityEngine_MeshRendererWrap.Register(state); + state.EndPreModule(preTop); + LuaDLL.lua_settop(L, top); + return 0; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LuaOpen_UnityEngine_ParticleEmitter(IntPtr L) + { + try + { + int top = LuaDLL.lua_gettop(L); + LuaState state = LuaState.Get(L); + int preTop = state.BeginPreModule("UnityEngine"); + UnityEngine_ParticleEmitterWrap.Register(state); + state.EndPreModule(preTop); + LuaDLL.lua_settop(L, top); + return 0; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LuaOpen_UnityEngine_ParticleRenderer(IntPtr L) + { + try + { + int top = LuaDLL.lua_gettop(L); + LuaState state = LuaState.Get(L); + int preTop = state.BeginPreModule("UnityEngine"); + UnityEngine_ParticleRendererWrap.Register(state); + state.EndPreModule(preTop); + LuaDLL.lua_settop(L, top); + return 0; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LuaOpen_UnityEngine_ParticleAnimator(IntPtr L) + { + try + { + int top = LuaDLL.lua_gettop(L); + LuaState state = LuaState.Get(L); + int preTop = state.BeginPreModule("UnityEngine"); + UnityEngine_ParticleAnimatorWrap.Register(state); + state.EndPreModule(preTop); + LuaDLL.lua_settop(L, top); + return 0; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LuaOpen_UnityEngine_BoxCollider(IntPtr L) + { + try + { + int top = LuaDLL.lua_gettop(L); + LuaState state = LuaState.Get(L); + int preTop = state.BeginPreModule("UnityEngine"); + UnityEngine_BoxColliderWrap.Register(state); + state.EndPreModule(preTop); + LuaDLL.lua_settop(L, top); + return 0; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LuaOpen_UnityEngine_MeshCollider(IntPtr L) + { + try + { + int top = LuaDLL.lua_gettop(L); + LuaState state = LuaState.Get(L); + int preTop = state.BeginPreModule("UnityEngine"); + UnityEngine_MeshColliderWrap.Register(state); + state.EndPreModule(preTop); + LuaDLL.lua_settop(L, top); + return 0; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LuaOpen_UnityEngine_SphereCollider(IntPtr L) + { + try + { + int top = LuaDLL.lua_gettop(L); + LuaState state = LuaState.Get(L); + int preTop = state.BeginPreModule("UnityEngine"); + UnityEngine_SphereColliderWrap.Register(state); + state.EndPreModule(preTop); + LuaDLL.lua_settop(L, top); + return 0; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LuaOpen_UnityEngine_CharacterController(IntPtr L) + { + try + { + int top = LuaDLL.lua_gettop(L); + LuaState state = LuaState.Get(L); + int preTop = state.BeginPreModule("UnityEngine"); + UnityEngine_CharacterControllerWrap.Register(state); + state.EndPreModule(preTop); + LuaDLL.lua_settop(L, top); + return 0; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LuaOpen_UnityEngine_CapsuleCollider(IntPtr L) + { + try + { + int top = LuaDLL.lua_gettop(L); + LuaState state = LuaState.Get(L); + int preTop = state.BeginPreModule("UnityEngine"); + UnityEngine_CapsuleColliderWrap.Register(state); + state.EndPreModule(preTop); + LuaDLL.lua_settop(L, top); + return 0; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LuaOpen_UnityEngine_Animation(IntPtr L) + { + try + { + int top = LuaDLL.lua_gettop(L); + LuaState state = LuaState.Get(L); + int preTop = state.BeginPreModule("UnityEngine"); + UnityEngine_AnimationWrap.Register(state); + state.EndPreModule(preTop); + LuaDLL.lua_settop(L, top); + return 0; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LuaOpen_UnityEngine_AnimationClip(IntPtr L) + { + try + { + int top = LuaDLL.lua_gettop(L); + LuaState state = LuaState.Get(L); + int preTop = state.BeginPreModule("UnityEngine"); + UnityEngine_AnimationClipWrap.Register(state); + state.EndPreModule(preTop); + LuaDLL.lua_settop(L, top); + return 0; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LuaOpen_UnityEngine_AnimationState(IntPtr L) + { + try + { + int top = LuaDLL.lua_gettop(L); + LuaState state = LuaState.Get(L); + int preTop = state.BeginPreModule("UnityEngine"); + UnityEngine_AnimationStateWrap.Register(state); + state.EndPreModule(preTop); + LuaDLL.lua_settop(L, top); + return 0; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LuaOpen_UnityEngine_BlendWeights(IntPtr L) + { + try + { + int top = LuaDLL.lua_gettop(L); + LuaState state = LuaState.Get(L); + int preTop = state.BeginPreModule("UnityEngine"); + UnityEngine_BlendWeightsWrap.Register(state); + state.EndPreModule(preTop); + LuaDLL.lua_settop(L, top); + return 0; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LuaOpen_UnityEngine_RenderTexture(IntPtr L) + { + try + { + int top = LuaDLL.lua_gettop(L); + LuaState state = LuaState.Get(L); + int preTop = state.BeginPreModule("UnityEngine"); + UnityEngine_RenderTextureWrap.Register(state); + state.EndPreModule(preTop); + LuaDLL.lua_settop(L, top); + return 0; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LuaOpen_UnityEngine_Rigidbody(IntPtr L) + { + try + { + int top = LuaDLL.lua_gettop(L); + LuaState state = LuaState.Get(L); + int preTop = state.BeginPreModule("UnityEngine"); + UnityEngine_RigidbodyWrap.Register(state); + state.EndPreModule(preTop); + LuaDLL.lua_settop(L, top); + return 0; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } +} + diff --git a/Assets/Terrain.asset.meta b/Assets/Terrain.asset.meta index d84a251..b70af39 100644 --- a/Assets/Terrain.asset.meta +++ b/Assets/Terrain.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 42f2caa1031618d4cbe468a7600d484c +guid: 0e7ddac740cdf4642b3e67f0fbd1163e timeCreated: 1450865000 licenseType: Free NativeFormatImporter: diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 280a9fd..5a96ca8 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,10 +3,13 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 3 + serializedVersion: 5 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} + m_DeferredReflections: + m_Mode: 1 + m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} m_LegacyDeferred: m_Mode: 1 m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} @@ -18,12 +21,17 @@ GraphicsSettings: - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] + m_ShaderSettings: + useScreenSpaceShadows: 1 + m_BuildTargetShaderSettings: [] m_LightmapStripping: 0 + m_FogStripping: 0 m_LightmapKeepPlain: 1 m_LightmapKeepDirCombined: 1 m_LightmapKeepDirSeparate: 1 - m_LightmapKeepDynamic: 1 - m_FogStripping: 0 + m_LightmapKeepDynamicPlain: 1 + m_LightmapKeepDynamicDirCombined: 1 + m_LightmapKeepDynamicDirSeparate: 1 m_FogKeepLinear: 1 m_FogKeepExp: 1 m_FogKeepExp2: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c69f843..71a00f9 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,11 +3,10 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 8 AndroidProfiler: 0 defaultScreenOrientation: 2 targetDevice: 2 - targetResolution: 0 useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany @@ -15,6 +14,7 @@ PlayerSettings: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_ShowUnitySplashScreen: 1 + m_VirtualRealitySplashScreen: {fileID: 0} defaultScreenWidth: 1024 defaultScreenHeight: 768 defaultScreenWidthWeb: 960 @@ -56,15 +56,19 @@ PlayerSettings: xboxEnableKinectAutoTracking: 0 xboxEnableFitness: 0 visibleInBackground: 0 + allowFullscreenSwitch: 1 macFullscreenMode: 2 d3d9FullscreenMode: 1 d3d11FullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 + xboxEnablePIXSampling: 0 n3dsDisableStereoscopicView: 0 n3dsEnableSharedListOpt: 1 n3dsEnableVSync: 0 + uiUse16BitDepthBuffer: 0 + ignoreAlphaClear: 0 xboxOneResolution: 0 ps3SplashScreen: {fileID: 0} videoMemoryForVertexBuffers: 0 @@ -115,6 +119,7 @@ PlayerSettings: iPhoneTargetOSVersion: 22 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 + uIRequiresFullScreen: 1 uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 @@ -128,6 +133,10 @@ PlayerSettings: iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} iPadHighResLandscapeSplashScreen: {fileID: 0} + appleTVSplashScreen: {fileID: 0} + tvOSSmallIconLayers: [] + tvOSLargeIconLayers: [] + tvOSTopShelfImageLayers: [] iOSLaunchScreenType: 0 iOSLaunchScreenPortrait: {fileID: 0} iOSLaunchScreenLandscape: {fileID: 0} @@ -270,7 +279,12 @@ PlayerSettings: playerPrefsSupport: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 + ps4SocialScreenEnabled: 0 ps4Audio3dVirtualSpeakerCount: 14 + ps4attribCpuUsage: 0 + ps4PatchPkgPath: + ps4PatchLatestPkgPath: + ps4PatchChangeinfoPath: ps4attribUserManagement: 0 ps4attribMoveSupport: 0 ps4attrib3DSupport: 0 @@ -330,10 +344,6 @@ PlayerSettings: 4: ASYNC_MODE 7: ASYNC_MODE metroPackageName: SimpleFramework - metroPackageLogo: - metroPackageLogo140: - metroPackageLogo180: - metroPackageLogo240: metroPackageVersion: metroCertificatePath: metroCertificatePassword: @@ -341,44 +351,7 @@ PlayerSettings: metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: SimpleFramework - metroStoreTileLogo80: - metroStoreTileLogo: - metroStoreTileLogo140: - metroStoreTileLogo180: - metroStoreTileWideLogo80: - metroStoreTileWideLogo: - metroStoreTileWideLogo140: - metroStoreTileWideLogo180: - metroStoreTileSmallLogo80: - metroStoreTileSmallLogo: - metroStoreTileSmallLogo140: - metroStoreTileSmallLogo180: - metroStoreSmallTile80: - metroStoreSmallTile: - metroStoreSmallTile140: - metroStoreSmallTile180: - metroStoreLargeTile80: - metroStoreLargeTile: - metroStoreLargeTile140: - metroStoreLargeTile180: - metroStoreSplashScreenImage: - metroStoreSplashScreenImage140: - metroStoreSplashScreenImage180: - metroPhoneAppIcon: - metroPhoneAppIcon140: - metroPhoneAppIcon240: - metroPhoneSmallTile: - metroPhoneSmallTile140: - metroPhoneSmallTile240: - metroPhoneMediumTile: - metroPhoneMediumTile140: - metroPhoneMediumTile240: - metroPhoneWideTile: - metroPhoneWideTile140: - metroPhoneWideTile240: - metroPhoneSplashScreenImage: - metroPhoneSplashScreenImage140: - metroPhoneSplashScreenImage240: + wsaImages: {} metroTileShortName: metroCommandLineArgsFile: metroTileShowName: 1 @@ -465,6 +438,9 @@ PlayerSettings: - iOS::Architecture - iOS::EnableIncrementalBuildSupportForIl2cpp - iOS::ScriptingBackend + - tvOS::Architecture + - tvOS::EnableIncrementalBuildSupportForIl2cpp + - tvOS::ScriptingBackend Android::ScriptingBackend: 0 Metro::ScriptingBackend: 2 Standalone::ScriptingBackend: 0 @@ -476,6 +452,9 @@ PlayerSettings: iOS::Architecture: 0 iOS::EnableIncrementalBuildSupportForIl2cpp: 0 iOS::ScriptingBackend: 0 + tvOS::Architecture: 1 + tvOS::EnableIncrementalBuildSupportForIl2cpp: 0 + tvOS::ScriptingBackend: 1 boolPropertyNames: - WebGL::analyzeBuildSize - WebGL::dataCaching @@ -490,7 +469,6 @@ PlayerSettings: WebGL::emscriptenArgs: WebGL::template: APPLICATION:Default additionalIl2CppArgs::additionalIl2CppArgs: - firstStreamedSceneWithResources: 0 cloudProjectId: projectName: organizationId: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index b11ab9b..c4684cd 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.2.2f1 +m_EditorVersion: 5.3.4f1 m_StandardAssetsVersion: 0 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 32a2f6e..e46dfed 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -14,8 +14,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 1 shadowDistance: 15 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 2 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 1 textureQuality: 1 anisotropicTextures: 0 @@ -25,9 +26,11 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 0 - lodBias: .300000012 + lodBias: 0.3 maximumLODLevel: 0 particleRaycastBudget: 4 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 name: Fast @@ -37,8 +40,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 1 shadowDistance: 20 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 2 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 2 textureQuality: 0 anisotropicTextures: 0 @@ -48,9 +52,11 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 0 - lodBias: .400000006 + lodBias: 0.4 maximumLODLevel: 0 particleRaycastBudget: 16 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 name: Simple @@ -60,8 +66,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 1 shadowDistance: 20 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 2 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 2 textureQuality: 0 anisotropicTextures: 1 @@ -71,9 +78,11 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 0 - lodBias: .699999988 + lodBias: 0.7 maximumLODLevel: 0 particleRaycastBudget: 64 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 name: Good @@ -83,8 +92,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 2 shadowDistance: 40 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 2 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 2 textureQuality: 0 anisotropicTextures: 1 @@ -97,6 +107,8 @@ QualitySettings: lodBias: 1 maximumLODLevel: 0 particleRaycastBudget: 256 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 name: Beautiful @@ -106,8 +118,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 2 shadowDistance: 70 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 2 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 4 textureQuality: 0 anisotropicTextures: 2 @@ -120,6 +133,8 @@ QualitySettings: lodBias: 1.5 maximumLODLevel: 0 particleRaycastBudget: 1024 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 name: Fantastic @@ -129,8 +144,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 4 shadowDistance: 150 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 2 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 4 textureQuality: 0 anisotropicTextures: 2 @@ -143,5 +159,7 @@ QualitySettings: lodBias: 2 maximumLODLevel: 0 particleRaycastBudget: 4096 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: {} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 52a210e..90c9516 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -17,7 +17,7 @@ TagManager: - - - Map - - + - CanAttack - - -