diff --git a/Assets/ManagedResources/Spine/r_MapEffect_NewEvent_002/r_MapEffect_NewEvent_002.atlas.txt b/Assets/ManagedResources/Spine/r_MapEffect_NewEvent_002/r_MapEffect_NewEvent_002.atlas.txt index 6fa53a5a23..d96d9b2c2d 100644 --- a/Assets/ManagedResources/Spine/r_MapEffect_NewEvent_002/r_MapEffect_NewEvent_002.atlas.txt +++ b/Assets/ManagedResources/Spine/r_MapEffect_NewEvent_002/r_MapEffect_NewEvent_002.atlas.txt @@ -1,69 +1,251 @@ r_MapEffect_NewEvent_002.png -size: 256,512 +size: 1024,1024 format: RGBA8888 filter: Linear,Linear repeat: none +b_shenti_20 + rotate: false + xy: 902, 720 + size: 120, 127 + orig: 120, 127 + offset: 0, 0 + index: -1 +b_weiba_16 + rotate: true + xy: 950, 851 + size: 106, 61 + orig: 106, 61 + offset: 0, 0 + index: -1 +b_weijin_2 + rotate: false + xy: 758, 849 + size: 190, 173 + orig: 190, 173 + offset: 0, 0 + index: -1 +b_wuqi_1 + rotate: false + xy: 445, 749 + size: 311, 273 + orig: 311, 273 + offset: 0, 0 + index: -1 +b_youshou_12 + rotate: false + xy: 387, 366 + size: 83, 41 + orig: 83, 41 + offset: 0, 0 + index: -1 +b_youshou_13 + rotate: true + xy: 950, 959 + size: 63, 72 + orig: 63, 72 + offset: 0, 0 + index: -1 +b_youtui_17 + rotate: true + xy: 663, 518 + size: 41, 54 + orig: 41, 54 + offset: 0, 0 + index: -1 +b_youtui_18 + rotate: true + xy: 234, 52 + size: 40, 20 + orig: 40, 20 + offset: 0, 0 + index: -1 +b_zuoshou_10 + rotate: true + xy: 357, 274 + size: 71, 32 + orig: 71, 32 + offset: 0, 0 + index: -1 +b_zuoshou_11 + rotate: true + xy: 659, 561 + size: 59, 71 + orig: 59, 71 + offset: 0, 0 + index: -1 +b_zuotui_14 + rotate: false + xy: 357, 180 + size: 24, 31 + orig: 24, 31 + offset: 0, 0 + index: -1 +b_zuotui_15 + rotate: true + xy: 535, 507 + size: 48, 71 + orig: 48, 71 + offset: 0, 0 + index: -1 bady rotate: false - xy: 2, 153 - size: 191, 142 - orig: 191, 142 + xy: 2, 347 + size: 383, 284 + orig: 383, 284 + offset: 0, 0 + index: -1 +l_biyan_4 + rotate: false + xy: 472, 378 + size: 42, 29 + orig: 42, 29 + offset: 0, 0 + index: -1 +l_erduo_1 + rotate: false + xy: 732, 559 + size: 48, 61 + orig: 48, 61 + offset: 0, 0 + index: -1 +l_jiao_17 + rotate: false + xy: 387, 409 + size: 133, 46 + orig: 133, 46 + offset: 0, 0 + index: -1 +l_jiao_3 + rotate: false + xy: 387, 457 + size: 119, 60 + orig: 119, 60 + offset: 0, 0 + index: -1 +l_tou_5 + rotate: true + xy: 902, 587 + size: 131, 108 + orig: 131, 108 + offset: 0, 0 + index: -1 +l_weiba_20 + rotate: false + xy: 2, 2 + size: 136, 90 + orig: 136, 90 + offset: 0, 0 + index: -1 +l_weijin_6 + rotate: true + xy: 357, 213 + size: 59, 28 + orig: 59, 28 + offset: 0, 0 + index: -1 +l_weijin_9 + rotate: false + xy: 787, 615 + size: 113, 143 + orig: 113, 143 + offset: 0, 0 + index: -1 +l_wuqi_16 + rotate: true + xy: 445, 622 + size: 125, 340 + orig: 125, 340 + offset: 0, 0 + index: -1 +l_youshou_18 + rotate: false + xy: 535, 557 + size: 122, 63 + orig: 122, 63 + offset: 0, 0 + index: -1 +l_youtui_12 + rotate: true + xy: 608, 510 + size: 45, 53 + orig: 45, 53 + offset: 0, 0 + index: -1 +l_youtui_14 + rotate: true + xy: 508, 476 + size: 41, 25 + orig: 41, 25 + offset: 0, 0 + index: -1 +l_zuoshou_7 + rotate: false + xy: 758, 760 + size: 126, 87 + orig: 126, 87 + offset: 0, 0 + index: -1 +l_zuotui_10 + rotate: true + xy: 140, 10 + size: 82, 92 + orig: 82, 92 offset: 0, 0 index: -1 tou - rotate: false - xy: 130, 101 - size: 100, 50 - orig: 100, 50 + rotate: true + xy: 256, 146 + size: 199, 99 + orig: 199, 99 offset: 0, 0 index: -1 tou1 rotate: false - xy: 2, 25 - size: 126, 126 - orig: 126, 126 + xy: 2, 94 + size: 252, 251 + orig: 252, 251 offset: 0, 0 index: -1 weiba rotate: false - xy: 130, 49 - size: 73, 50 - orig: 73, 50 + xy: 387, 519 + size: 146, 101 + orig: 146, 101 offset: 0, 0 index: -1 wq rotate: false - xy: 2, 297 - size: 221, 195 - orig: 221, 195 + xy: 2, 633 + size: 441, 389 + orig: 441, 389 offset: 0, 0 index: -1 xiaoxingxing rotate: false - xy: 225, 477 - size: 12, 15 - orig: 12, 15 + xy: 256, 69 + size: 25, 31 + orig: 25, 31 offset: 0, 0 index: -1 yanzhu rotate: false - xy: 195, 287 - size: 5, 8 - orig: 5, 8 + xy: 719, 543 + size: 11, 16 + orig: 11, 16 offset: 0, 0 index: -1 yanzhu2 rotate: false - xy: 130, 39 - size: 5, 8 - orig: 5, 8 + xy: 508, 457 + size: 11, 17 + orig: 11, 17 offset: 0, 0 index: -1 zuiba rotate: false - xy: 2, 2 - size: 44, 21 - orig: 44, 21 + xy: 256, 102 + size: 88, 42 + orig: 88, 42 offset: 0, 0 index: -1 diff --git a/Assets/ManagedResources/Spine/r_MapEffect_NewEvent_002/r_MapEffect_NewEvent_002.png b/Assets/ManagedResources/Spine/r_MapEffect_NewEvent_002/r_MapEffect_NewEvent_002.png index 35d10e70a2..019100ad58 100644 Binary files a/Assets/ManagedResources/Spine/r_MapEffect_NewEvent_002/r_MapEffect_NewEvent_002.png and b/Assets/ManagedResources/Spine/r_MapEffect_NewEvent_002/r_MapEffect_NewEvent_002.png differ diff --git a/Assets/ManagedResources/Spine/r_MapEffect_NewEvent_002/r_MapEffect_NewEvent_002.skel.bytes b/Assets/ManagedResources/Spine/r_MapEffect_NewEvent_002/r_MapEffect_NewEvent_002.skel.bytes index 211e7186c0..ef50346b08 100644 Binary files a/Assets/ManagedResources/Spine/r_MapEffect_NewEvent_002/r_MapEffect_NewEvent_002.skel.bytes and b/Assets/ManagedResources/Spine/r_MapEffect_NewEvent_002/r_MapEffect_NewEvent_002.skel.bytes differ diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index e6a34fbc4a..c1379b080f 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2355,6 +2355,17 @@ WALK_DIR = { LAUCH = 10,--发射 TOUCH = 11,--轻按 } +MONSTER_WALK_DIR = { + --没有坐骑的时候 + IDLE = {animation = "idle", y = 0}, + IDLEBACK = {animation = "idle_b", y = 0}, + RIGHT = {animation = "idle_l", y = 180}, + LEFT = {animation = "idle_l", y = 0}, + RUN_RIGHT = {animation = "run_l", y = 180}, + RUN_LEFT = {animation = "run_l", y = 0}, + RUN_UP = {animation = "run_b", y = 0}, + RUN_DOWN = {animation = "run_1", y = 0}, +} PLAYER_WALK_DIR = { --没有坐骑的时候 IDLE = {animation = "idle", y = 0}, diff --git a/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua b/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua index 979611edf6..a8af04a918 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua @@ -112,10 +112,10 @@ MapFloatingConfig = { scale = Vector3.New(0.2, 0.2, 0.2), scale1 = Vector3.New(0.1, 0.1, 0.1), position = Vector3.New(0, 40, 0)}, - [25] = {name = "live2d_npc_map_boy",--人 - scale = Vector3.New(0.2, 0.2, 0.2), + [25] = {name = "live2d_r_MapEffect_NewEvent_002",--人 + scale = Vector3.New(0.05, 0.05, 0.05), scale1 = Vector3.New(0.1, 0.1, 0.1), - position = Vector3.New(0, 40, 0)}, + position = Vector3.New(0, 0, 0)}, } -- 特效资源的相关数组 diff --git a/Assets/ManagedResources/~Lua/View/MonsterLiveView.lua b/Assets/ManagedResources/~Lua/View/MonsterLiveView.lua index fcbcf22735..8f7f44de0a 100644 --- a/Assets/ManagedResources/~Lua/View/MonsterLiveView.lua +++ b/Assets/ManagedResources/~Lua/View/MonsterLiveView.lua @@ -26,21 +26,21 @@ end function MonsterLiveView:SetWalkDir(dir) if dir == WALK_DIR.IDLE_FRONT then-- 站立_向前 - self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE) + self:SetWalkDirInfo(MONSTER_WALK_DIR.IDLE) elseif dir == WALK_DIR.IDLE_BACK then-- 站立_向后 - self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLEBACK) + self:SetWalkDirInfo(MONSTER_WALK_DIR.IDLEBACK) elseif dir == WALK_DIR.IDLE_LEFT then-- 站立_向左 - self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE) + self:SetWalkDirInfo(MONSTER_WALK_DIR.LEFT) elseif dir == WALK_DIR.IDLE_RIGHT then-- 站立_向右 - self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE) + self:SetWalkDirInfo(MONSTER_WALK_DIR.RIGHT) elseif dir == WALK_DIR.RUN_RIGHT then-- 跑_向右 - self:SetWalkDirInfo(PLAYER_WALK_DIR.RIGHT) + self:SetWalkDirInfo(MONSTER_WALK_DIR.RUN_RIGHT) elseif dir == WALK_DIR.RUN_LEFT then-- 跑_向左 - self:SetWalkDirInfo(PLAYER_WALK_DIR.LEFT) + self:SetWalkDirInfo(MONSTER_WALK_DIR.RUN_LEFT) elseif dir == WALK_DIR.RUN_UP then-- 跑_向上 - self:SetWalkDirInfo(PLAYER_WALK_DIR.UP) + self:SetWalkDirInfo(MONSTER_WALK_DIR.RUN_UP) elseif dir == WALK_DIR.RUN_DOWN then-- 跑_向下 - self:SetWalkDirInfo(PLAYER_WALK_DIR.DOWN) + self:SetWalkDirInfo(MONSTER_WALK_DIR.RUN_DOWN) end end function MonsterLiveView:SetWalkDirInfo(playerDir)