This commit is contained in:
fatiao 2025-05-20 10:36:40 +08:00
parent 4e6c2d1be9
commit 06128db8e1
4 changed files with 28232 additions and 30479 deletions

File diff suppressed because it is too large Load Diff

View File

@ -565,8 +565,8 @@ function UIMainView:AddUIEventListener()
self.uiBase:AddButtonEventListener(self.shop.icon.button, self, self.ChangePage, Enum.MainViewPageType.Pet)
self.uiBase:AddButtonEventListener(self.role.icon.button, self, self.ChangePage, Enum.MainViewPageType.Role, 1)
self.uiBase:AddButtonEventListener(self.bag.icon.button, self, self.ChangePage, Enum.MainViewPageType.Bag)
self.uiBase:AddButtonEventListener(self.feixin.icon.button, self, self.ChangePage, Enum.MainViewPageType.Feixin)
self.uiBase:AddButtonEventListener(self.fruit.icon.button, self, self.ChangePage, Enum.MainViewPageType.Fruit)
-- self.uiBase:AddButtonEventListener(self.feixin.icon.button, self, self.ChangePage, Enum.MainViewPageType.Feixin)
-- self.uiBase:AddButtonEventListener(self.fruit.icon.button, self, self.ChangePage, Enum.MainViewPageType.Fruit)
self.uiBase:AddButtonEventListener(self.btnBase.button,self,self.OnClickBaseBtn)
self.uiBase:AddButtonEventListener(self.btnJob.button,self,self.OnClickJobBtn)

View File

@ -2,17 +2,6 @@
---@field public gameObject UnityEngine.GameObject
---@field public button UnityEngine.UI.Button
---@class UIMain__Generate_fruit_icon
---@field public gameObject UnityEngine.GameObject
---@field public button UnityEngine.UI.Button
---@field public buttonTriggerAnimation ButtonTriggerAnimation
---@class UIMain__Generate_fruit
---@field public gameObject UnityEngine.GameObject
---@field public rectTransform UnityEngine.RectTransform
---@field public icon UIMain__Generate_fruit_icon
---@field public redPoint UnityEngine.GameObject
---@class UIMain__Generate_shop_icon
---@field public gameObject UnityEngine.GameObject
---@field public button UnityEngine.UI.Button
@ -45,17 +34,6 @@
---@field public icon UIMain__Generate_adventure_icon
---@field public redPoint UnityEngine.GameObject
---@class UIMain__Generate_feixin_icon
---@field public gameObject UnityEngine.GameObject
---@field public button UnityEngine.UI.Button
---@field public buttonTriggerAnimation ButtonTriggerAnimation
---@class UIMain__Generate_feixin
---@field public gameObject UnityEngine.GameObject
---@field public rectTransform UnityEngine.RectTransform
---@field public icon UIMain__Generate_feixin_icon
---@field public redPoint UnityEngine.GameObject
---@class UIMain__Generate_bag_icon
---@field public gameObject UnityEngine.GameObject
---@field public button UnityEngine.UI.Button
@ -427,11 +405,9 @@
---@field private mainBtn UIMain__Generate_mainBtn
---@field private town UIMain__Generate_town
---@field private bag UIMain__Generate_bag
---@field private feixin UIMain__Generate_feixin
---@field private adventure UIMain__Generate_adventure
---@field private role UIMain__Generate_role
---@field private shop UIMain__Generate_shop
---@field private fruit UIMain__Generate_fruit
---@field private btnGM UIMain__Generate_btnGM
local UIMainView = class("UIMainView", require("UIViewBase"))
@ -553,12 +529,6 @@ function UIMainView:InitGenerate(Root, data)
self:InitGenerate__99(Root,data)
self:InitGenerate__100(Root,data)
self:InitGenerate__101(Root,data)
self:InitGenerate__102(Root,data)
self:InitGenerate__103(Root,data)
self:InitGenerate__104(Root,data)
self:InitGenerate__105(Root,data)
self:InitGenerate__106(Root,data)
self:InitGenerate__107(Root,data)
end
@ -1838,48 +1808,6 @@ end
---@private
function UIMainView:InitGenerate__93(Root, data)
--[[
BottomView/MainRoot/MainBtn/Feixin
--]]
local tmp = Root:Find("BottomView/MainRoot/MainBtn/Feixin").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.feixin = tmp
tmp.rectTransform = tmp:GetComponent(Enum.TypeInfo.RectTransform)
end
---@private
function UIMainView:InitGenerate__94(Root, data)
--[[
BottomView/MainRoot/MainBtn/Feixin/Image/Icon
--]]
local tmp = Root:Find("BottomView/MainRoot/MainBtn/Feixin/Image/Icon").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.feixin.icon = tmp
tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
tmp.buttonTriggerAnimation = tmp:GetComponent(Enum.TypeInfo.ButtonTriggerAnimation)
end
---@private
function UIMainView:InitGenerate__95(Root, data)
--[[
BottomView/MainRoot/MainBtn/Feixin/RedPoint
--]]
local tmp = Root:Find("BottomView/MainRoot/MainBtn/Feixin/RedPoint").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.feixin.redPoint = tmp
end
---@private
function UIMainView:InitGenerate__96(Root, data)
--[[
BottomView/MainRoot/MainBtn/Adventure
--]]
@ -1893,7 +1821,7 @@ function UIMainView:InitGenerate__96(Root, data)
end
---@private
function UIMainView:InitGenerate__97(Root, data)
function UIMainView:InitGenerate__94(Root, data)
--[[
BottomView/MainRoot/MainBtn/Adventure/Image/Icon
--]]
@ -1909,7 +1837,7 @@ function UIMainView:InitGenerate__97(Root, data)
end
---@private
function UIMainView:InitGenerate__98(Root, data)
function UIMainView:InitGenerate__95(Root, data)
--[[
BottomView/MainRoot/MainBtn/Adventure/RedPoint
--]]
@ -1921,7 +1849,7 @@ function UIMainView:InitGenerate__98(Root, data)
end
---@private
function UIMainView:InitGenerate__99(Root, data)
function UIMainView:InitGenerate__96(Root, data)
--[[
BottomView/MainRoot/MainBtn/Role
--]]
@ -1935,7 +1863,7 @@ function UIMainView:InitGenerate__99(Root, data)
end
---@private
function UIMainView:InitGenerate__100(Root, data)
function UIMainView:InitGenerate__97(Root, data)
--[[
BottomView/MainRoot/MainBtn/Role/Image/Icon
--]]
@ -1951,7 +1879,7 @@ function UIMainView:InitGenerate__100(Root, data)
end
---@private
function UIMainView:InitGenerate__101(Root, data)
function UIMainView:InitGenerate__98(Root, data)
--[[
BottomView/MainRoot/MainBtn/Shop
--]]
@ -1965,7 +1893,7 @@ function UIMainView:InitGenerate__101(Root, data)
end
---@private
function UIMainView:InitGenerate__102(Root, data)
function UIMainView:InitGenerate__99(Root, data)
--[[
BottomView/MainRoot/MainBtn/Shop/Image/Icon
--]]
@ -1981,7 +1909,7 @@ function UIMainView:InitGenerate__102(Root, data)
end
---@private
function UIMainView:InitGenerate__103(Root, data)
function UIMainView:InitGenerate__100(Root, data)
--[[
BottomView/MainRoot/MainBtn/Shop/RedPoint
--]]
@ -1993,49 +1921,7 @@ function UIMainView:InitGenerate__103(Root, data)
end
---@private
function UIMainView:InitGenerate__104(Root, data)
--[[
BottomView/MainRoot/MainBtn/Fruit
--]]
local tmp = Root:Find("BottomView/MainRoot/MainBtn/Fruit").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.fruit = tmp
tmp.rectTransform = tmp:GetComponent(Enum.TypeInfo.RectTransform)
end
---@private
function UIMainView:InitGenerate__105(Root, data)
--[[
BottomView/MainRoot/MainBtn/Fruit/Image/Icon
--]]
local tmp = Root:Find("BottomView/MainRoot/MainBtn/Fruit/Image/Icon").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.fruit.icon = tmp
tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
tmp.buttonTriggerAnimation = tmp:GetComponent(Enum.TypeInfo.ButtonTriggerAnimation)
end
---@private
function UIMainView:InitGenerate__106(Root, data)
--[[
BottomView/MainRoot/MainBtn/Fruit/RedPoint
--]]
local tmp = Root:Find("BottomView/MainRoot/MainBtn/Fruit/RedPoint").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.fruit.redPoint = tmp
end
---@private
function UIMainView:InitGenerate__107(Root, data)
function UIMainView:InitGenerate__101(Root, data)
--[[
BtnGM
--]]
@ -2050,12 +1936,6 @@ end
---@private
function UIMainView:GenerateDestroy()
if tolua.getpeer(self.fruit.redPoint) ~= nil then
tolua.setpeer(self.fruit.redPoint, nil)
end
if tolua.getpeer(self.fruit.icon) ~= nil then
tolua.setpeer(self.fruit.icon, nil)
end
if tolua.getpeer(self.shop.redPoint) ~= nil then
tolua.setpeer(self.shop.redPoint, nil)
end
@ -2071,12 +1951,6 @@ function UIMainView:GenerateDestroy()
if tolua.getpeer(self.adventure.icon) ~= nil then
tolua.setpeer(self.adventure.icon, nil)
end
if tolua.getpeer(self.feixin.redPoint) ~= nil then
tolua.setpeer(self.feixin.redPoint, nil)
end
if tolua.getpeer(self.feixin.icon) ~= nil then
tolua.setpeer(self.feixin.icon, nil)
end
if tolua.getpeer(self.bag.redPoint) ~= nil then
tolua.setpeer(self.bag.redPoint, nil)
end
@ -2387,10 +2261,6 @@ function UIMainView:GenerateDestroy()
tolua.setpeer(self.bag, nil)
end
self.bag = nil
if tolua.getpeer(self.feixin) ~= nil then
tolua.setpeer(self.feixin, nil)
end
self.feixin = nil
if tolua.getpeer(self.adventure) ~= nil then
tolua.setpeer(self.adventure, nil)
end
@ -2403,10 +2273,6 @@ function UIMainView:GenerateDestroy()
tolua.setpeer(self.shop, nil)
end
self.shop = nil
if tolua.getpeer(self.fruit) ~= nil then
tolua.setpeer(self.fruit, nil)
end
self.fruit = nil
if tolua.getpeer(self.btnGM) ~= nil then
tolua.setpeer(self.btnGM, nil)
end

View File

@ -104,7 +104,7 @@ public class FighterStateRun : FighterState
mLastDestPos = new FixVector3(mFighter.Position);
mChaseFighter = chaseFighter;
mStopDist = stopDist;
mMoveSpeedPerFrame = (Fix64)mFighter.MoveSpeed / (Fix64)Constants.frame_to_time;
mMoveSpeedPerFrame = (Fix64)mFighter.MoveSpeed*2.0f / (Fix64)Constants.frame_to_time;
CheckDestPos();