diff --git a/.gitignore b/.gitignore
index 5932a6e5..2dd9fbfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
!.gitignore
lua_probject/.emmyrc.json
lua_probject/base_project/Game/View/Common/FguiEmojiDict.lua
+wb_unity_pro/Pack/
diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua
index 7dc93877..18e985e6 100644
--- a/lua_probject/base_project/Game/View/FamilyView.lua
+++ b/lua_probject/base_project/Game/View/FamilyView.lua
@@ -154,6 +154,7 @@ function M:init(url)
self.cMyfamilyList = view:GetController("cMyfamilyList")
self.btn_quitMyfamilyTab = view:GetChild("btn_quitMyfamilyTab")
self.btn_chatRoom = view:GetChild("btn_chatRoom")
+ self.list_family = view:GetChild("list_family")
self.cChatRoomRedPoint = self.btn_chatRoom:GetController("cRedPoint")
@@ -220,6 +221,25 @@ function M:init(url)
--FamilyChatRoom:Show(self.ChatRoomData)
self.com_FamilyChatRoom:Show()
end)
+
+ self.list_family.itemRenderer = function(i, obj)
+ local j = i + 1
+ local group = DataManager.groups.groupList[j]
+ obj:GetChild("title").emojies = EmojiDitc.EmojiesDitc
+ obj.text = Utils.TextOmit(group.name, 6, "...")
+ obj.onClick:Add(function()
+ if self._group ~= nil and group.id == self._group.id then
+ --ViewUtil.ShowBannerOnScreenCenter("已在家族中")
+ return
+ end
+
+ self.curGroupIndex = j
+
+ self:ConnetFamily(j, DataManager.groups.groupList)
+ end)
+ end
+
+ self.familyType.selectedIndex = 1
end
function M:Reflash()
@@ -234,8 +254,11 @@ function M:Reflash()
local groups = res.Data.groups
if #groups > 0 then
- self.familyType.selectedIndex = 1
- self:ConnetFamily(1, groups, true)
+ --self:ConnetFamily(1, groups)
+ self.list_family.numItems = #DataManager.groups.groupList
+ local index = (self.curGroupIndex or 1) - 1
+ local btn = self.list_family:GetChildAt(index)
+ btn.onClick:Call()
else
self:JoinFamily(true)
self.btn_chatRoom.visible = false
@@ -775,7 +798,7 @@ function M:ReflashFamilyList()
list_family.numItems = #DataManager.groups.groupList
end
-function M:ConnetFamily(index, groups, isCreate)
+function M:ConnetFamily(index, groups)
if self._group then
FamilyOffline(self._group.id, self)
end
@@ -783,8 +806,6 @@ function M:ConnetFamily(index, groups, isCreate)
UpdateBeat:Remove(self.OnUpdate, self)
ViewUtil:CloseModalWait()
- local list_family = self._view:GetChild('list_family')
- --list_family:SetVirtual()
self._group = DataManager.groups:get(groups[index].id)
DataManager.CurrenGroup = self._group
self._view:GetChild('text_familyId').text = self._group.id
@@ -793,27 +814,6 @@ function M:ConnetFamily(index, groups, isCreate)
pt(self._group)
self._roomNum = self._group.room_num
- if isCreate then
- list_family.itemRenderer = function(i, obj)
- local j = i + 1
- local group = DataManager.groups.groupList[j]
- obj:GetChild("title").emojies = EmojiDitc.EmojiesDitc
- obj.text = Utils.TextOmit(group.name, 6, "...")
- obj.onClick:Add(function()
- if group.id == self._group.id then
- --ViewUtil.ShowBannerOnScreenCenter("已在家族中")
- return
- end
-
- self:ConnetFamily(j, DataManager.groups.groupList, false)
- end)
- end
- list_family.numItems = #groups
- if list_family.selectedIndex == -1 then
- list_family.selectedIndex = 0
- end
- end
-
local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait(self._root_view, "正在进入亲友圈......")
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
index 0dbd8735..825f49a9 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
@@ -136,6 +136,18 @@ function M:FillGameData()
end
printlog("lingmeng GameListView.new", lst_game, index, page, self.room_config)
self.gl_view = GameListView.new(lst_game, index, page, self.room_config)
+
+ -- 通用设置
+ local com_editSetting = self.gl_view:GetModeData().data._config:GetChild("com_editSetting")
+
+ self.cGps = com_editSetting:GetController("cGps")
+ self.cTuoguan = com_editSetting:GetController("cTuoguan")
+ self.cJiesan = com_editSetting:GetController("cJiesan")
+ self.cGongneng = com_editSetting:GetController("cGongneng")
+ self.cChat = com_editSetting:GetController("cChat")
+ self.cMisslie = com_editSetting:GetController("cMisslie")
+
+
local btn_close = lst_game:GetChild("btn_close")
btn_close.onClick:Set(function()
self:Destroy()
@@ -146,6 +158,31 @@ function M:FillGameData()
tex_name.text = Utils.TextOmit(self.play.name, 6, "...")
self._view:GetChild("tex_times").text = self.play.hp_times / 1000
self.SliderTimes.value = self.play.hp_times / 1000
+
+ local config = json.decode(self.play.config)
+ local hpData = json.decode(self.play.hpData)
+
+ self.cGps.selectedIndex = 2
+ if config.GPSDetection == 100 then
+ self.cGps.selectedIndex = 0
+ elseif config.GPSDetection == 500 then
+ self.cGps.selectedIndex = 1
+ elseif config.GPSDetection == 0 then
+ self.cGps.selectedIndex = 2
+ end
+
+ self.cTuoguan.selectedIndex = 0
+ if config.tuoguan_active_time == 30 then
+ self.cTuoguan.selectedIndex = 1
+ elseif config.tuoguan_active_time == 60 then
+ self.cTuoguan.selectedIndex = 2
+ elseif config.tuoguan_active_time == 120 then
+ self.cTuoguan.selectedIndex = 3
+ end
+
+ self.cJiesan.selectedIndex = hpData.JieShan - 1
+ self.cChat.selectedIndex = hpData.BanChat
+ self.cMisslie.selectedIndex = hpData.BanMissile
end
end
@@ -620,6 +657,7 @@ function M:FillFagData_jiangxi()
local cb_tuoguan_type = panel_play_set:GetChild("comb_result") --托管结算类型
local btn_hidden = panel_play_set:GetChild("btn_hidden") --防作弊开关
local btn_vip = panel_play_set:GetChild("btn_vip") --vip房间开关
+
--根据hpType显示
local game_data = mod.data.game_data
panel_play_set:GetController("game_type").selectedIndex = game_data and game_data.hpType or 0
@@ -870,36 +908,36 @@ function M:FillFagData_jiangxi()
_data.isvip = 0
end
- -- 通用设置
- local com_editSetting = mod.data._config:GetChild("com_editSetting")
- local cGps = com_editSetting:GetController("cGps")
- local cTuoguan = com_editSetting:GetController("cTuoguan")
- local cJiesan = com_editSetting:GetController("cJiesan")
- local cGongneng = com_editSetting:GetController("cGongneng")
- local cChat = com_editSetting:GetController("cChat")
- local cMisslie = com_editSetting:GetController("cMisslie")
-
-- GPS设置
- self.hpData.gps = cGps.selectedIndex + 1
+ local dis = 0
+ if self.cGps.selectedIndex == 0 then
+ dis = 100
+ elseif self.cGps.selectedIndex == 1 then
+ dis = 500
+ elseif self.cGps.selectedIndex == 2 then
+ dis = 0
+ end
+ _data.GPSDetection = dis
+
-- 托管
local time = 0
- if cTuoguan.selectedIndex == 1 then
+ if self.cTuoguan.selectedIndex == 1 then
time = 30
- elseif cTuoguan.selectedIndex == 2 then
+ elseif self.cTuoguan.selectedIndex == 2 then
time = 60
- elseif cTuoguan.selectedIndex == 3 then
+ elseif self.cTuoguan.selectedIndex == 3 then
time = 120
end
_data.tuoguan_active_time = time
-- 解散
- self.hpData.JieShan = cJiesan.selectedIndex + 1
+ self.hpData.JieShan = self.cJiesan.selectedIndex + 1
-- 功能
- self.hpData.GongNeng = cGongneng.selectedIndex + 1
+ self.hpData.GongNeng = self.cGongneng.selectedIndex + 1
-- 开启聊天
- self.hpData.BanChat = cChat.selectedIndex
+ self.hpData.BanChat = self.cChat.selectedIndex
-- 开启表情互动
- self.hpData.BanMissile = cMisslie.selectedIndex
+ self.hpData.BanMissile = self.cMisslie.selectedIndex
local hpType = mod.data.game_data.hpType
diff --git a/lua_probject/base_project/table/Table_Error_code.lua b/lua_probject/base_project/table/Table_Error_code.lua
index 03c81588..68f9d958 100644
--- a/lua_probject/base_project/table/Table_Error_code.lua
+++ b/lua_probject/base_project/table/Table_Error_code.lua
@@ -43,7 +43,7 @@ Table_Error_code_Map = {
[17]={id=17,note="奖券不足"},
[53]={id=53,note="与桌上玩家IP相同,进入房间失败"},
[54]={id=54,note="与桌上玩家距离过近,进入房间失败"},
- [55]={id=55,note="GPS未开启,进入房间失败"},
+ [55]={id=55,note="GPS服务未开启,请开启GPS服务!"},
[56]={id=56,note="不是大联盟"},
[57]={id=57,note="大联盟不能退出"},
[59]={id=59,note="无效的验证码"},
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
index fb30caf2..28eb9065 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
@@ -7,6 +7,7 @@ local TX_GameEvent = import(".GameEvent")
local HuTipView = import("main.majiang.HuTipView")
local SettingView = import(".EXSettingView")
local PlayerInfoView = import(".EXPlayerInfoView")
+local HuCardImg = import(".HuCardImg")
local M = {}
--- Create a new ZZ_MainView
@@ -16,8 +17,12 @@ function M.new()
self.EXClearingViewClass = EXClearingView
+ self.HuCardImg = setmetatable(HuCardImg, { __index = self.HuCardImg })
+
self.class = "MainView"
self.asset_group = "FuZhou_MJ"
+ self.HuCardImg_path = "ui://Extend_MJ_FuZhou/"
+ self.Sound_path = "extend/majiang/fuzhou/sound/"
self:init()
ViewUtil.PlayMuisc(self.asset_group, "extend/majiang/fuzhou/sound/bg.mp3")
return self
@@ -294,106 +299,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
_gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
- self._left_time = 0
- self:UpdateCardBox(0)
- self:__CloseTip()
- self._popEvent = false
- local arg = { ... }
- local win_seat = arg[1]
- local lose_seat = arg[2]
- local win_card = arg[3]
- local cards = arg[4]
- local win_list = arg[5]
- local index = self:GetPos(win_seat)
- local info = self._player_card_info[index]
- self:RemoveCursor()
- --info:UpdateHandCard(false, false)
- info:ShowHuCard(win_card)
-
- local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
- obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
- obj_win_card:GetController("bg").selectedIndex = 1
- info._view:AddChild(obj_win_card)
- obj_win_card:Center()
-
- local url, pNode
- local player = _room:GetPlayerBySeat(win_seat)
- if win_seat ~= _room.self_player.seat then
- url = "ui://Main_Majiang/别人胡"
- pNode = info._view
- elseif win_seat == _room.self_player.seat then
- url = "ui://Main_Majiang/自己胡牌"
- pNode = self._view
- end
- if win_seat == lose_seat then
- url = "ui://Main_Majiang/eff_zimo"
- end
-
- local he = UIPackage.CreateObjectFromURL(url)
- pNode:AddChild(he)
- he:GetTransition("t2"):Play()
- he:Center()
- if _room.room_config.people_num == 2 then
- if win_seat ~= _room.self_player.seat then
- he.scaleY = 0.4
- he.scaleX = 0.4
- he.x = he.width * 0.4 * 0.5 * -1
- he.y = he.height * 0.4 * 0.5 * -1
- end
- end
-
- if win_seat == _room.self_player.seat then
- printlog("自己位置=====")
- he:Center()
- elseif url == "ui://Main_Majiang/eff_zimo" then
- printlog("自摸地址==========")
- he.scaleY = 0.4
- he.scaleX = 0.4
- he.x = he.width * 0.4 * 0.5 * -1
- he.y = he.height * 0.4 * 0.5 * -1
- end
-
-
-
- ---
- local isZiMo = win_seat == lose_seat
- DataManager.CurrenRoom.isZiMoHu = isZiMo
- local hu_sound = isZiMo and ("zimo") or ("hu")
- printlog("声音====>>>", hu_sound)
- self:PlaySound("FuZhou_MJ", player.self_user.sex, hu_sound)
-
- local pNode = info._view
- local url = "eff_list1"
- local he_list = UIPackage.CreateObjectFromURL("ui://Extend_MJ_FuZhou/" .. url)
- he_list.touchable = false
- pNode:AddChild(he_list)
- he_list:Center()
-
- coroutine.start(function()
- coroutine.wait(0.4)
- for i = 1, #win_list do
- local tem = win_list[i]
- if tem.type > 0 and tem.type < 32 then
- local com_name = "he" .. tem.type
- printlog("声音====>>>", com_name)
- local sound_name = string.format("extend/majiang/fuzhou/sound/%s/%s.mp3",
- ViewUtil.Sex_Chat[player.self_user.sex],
- com_name)
- ViewUtil.PlaySound("FuZhou_MJ", sound_name)
-
- local listObj = he_list:GetChild("list")
- local imgPath = "ui://Extend_MJ_FuZhou/" .. com_name
- listObj:AddItemFromPool(imgPath)
- coroutine.wait(0.3)
- end
- end
-
- coroutine.wait(2)
- obj_win_card:Dispose()
- he:Dispose()
- he_list:Dispose()
- self._popEvent = true
- end)
+ MJMainView.OnHuCard(self, ...)
end)
_gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...)
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/HuCardImg.lua b/lua_probject/extend_project/extend/majiang/fuzhou/HuCardImg.lua
new file mode 100644
index 00000000..bd687ce6
--- /dev/null
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/HuCardImg.lua
@@ -0,0 +1,28 @@
+local HuCardImg = {
+}
+
+HuCardImg[1] = { 1 }
+HuCardImg[2] = { "tile_zimo" }
+HuCardImg[3] = { "tile_cs_shisanlan" }
+HuCardImg[4] = { "tile_cs_qxshisanlan" }
+HuCardImg[5] = { "tile_cs_pengpenghu" }
+HuCardImg[6] = { "tile_cs_pengpenghu", "tile_cs_qingyise" }
+HuCardImg[7] = { "tile_cs_pengpenghu", "tile_cs_ziyise" }
+HuCardImg[8] = { "tile_cs_qidui" }
+HuCardImg[9] = { "tile_cs_qidui", "tile_cs_qingyise" }
+HuCardImg[10] = { "tile_cs_qidui", "tile_cs_ziyise" }
+HuCardImg[11] = { "tile_cs_qingyisezhenhu" }
+HuCardImg[12] = { "tile_cs_qingyisejiahu" }
+HuCardImg[13] = { "tile_cs_ziyisezhenhu" }
+HuCardImg[14] = { "tile_cs_ziyisejiahu" }
+HuCardImg[15] = { "缺失" }
+HuCardImg[16] = { "tile_cs_dihu" }
+HuCardImg[17] = { "tile_cs_pinghu" }
+HuCardImg[18] = { "tile_cs_qiangganghu" }
+HuCardImg[19] = { "tile_cs_gangshanghua" }
+HuCardImg[20] = { "缺失" }
+HuCardImg[21] = { "tile_cs_siguiyi" }
+HuCardImg[22] = { "tile_cs_baguiyi" }
+HuCardImg[23] = { "tile_cs_seguiyi" }
+
+return HuCardImg
diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
index 744db5b0..d53d76f7 100644
--- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
@@ -7,6 +7,7 @@ local TX_GameEvent = import(".GameEvent")
local HuTipView = import("main.majiang.HuTipView")
local SettingView = import(".EXSettingView")
local PlayerInfoView = import(".EXPlayerInfoView")
+local HuCardImg = import(".HuCardImg")
local M = {}
--- Create a new ZZ_MainView
@@ -16,8 +17,12 @@ function M.new()
self.EXClearingViewClass = EXClearingView
+ self.HuCardImg = setmetatable(HuCardImg, { __index = self.HuCardImg })
+
self.class = "MainView"
self.asset_group = "JinXi_MJ"
+ self.HuCardImg_path = "ui://Extend_MJ_JinXi/"
+ self.Sound_path = "extend/majiang/jinxi/sound/"
self:init()
ViewUtil.PlayMuisc(self.asset_group, "extend/majiang/jinxi/sound/bg.mp3")
return self
@@ -293,6 +298,8 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
_gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
+ MJMainView.OnHuCard(self, ...)
+ --[[
self._left_time = 0
self:UpdateCardBox(0)
self:__CloseTip()
@@ -388,6 +395,7 @@ function M:EventInit()
he_list:Dispose()
self._popEvent = true
end)
+ ]]
end)
_gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...)
diff --git a/lua_probject/extend_project/extend/majiang/jinxi/HuCardImg.lua b/lua_probject/extend_project/extend/majiang/jinxi/HuCardImg.lua
new file mode 100644
index 00000000..a262132d
--- /dev/null
+++ b/lua_probject/extend_project/extend/majiang/jinxi/HuCardImg.lua
@@ -0,0 +1,7 @@
+local HuCardImg = {}
+
+HuCardImg[15] = {"tile_cs_tianhu"}
+HuCardImg[16] = {"tile_cs_dihu"}
+HuCardImg[17] = {"tile_cs_pinghu"}
+
+return HuCardImg
\ No newline at end of file
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
index 9a6058d2..bc9b0295 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
@@ -7,6 +7,7 @@ local TX_GameEvent = import(".GameEvent")
local HuTipView = import("main.majiang.HuTipView")
local SettingView = import(".EXSettingView")
local PlayerInfoView = import(".EXPlayerInfoView")
+local HuCardImg = import(".HuCardImg")
local M = {}
--- Create a new ZZ_MainView
@@ -16,8 +17,12 @@ function M.new()
self.EXClearingViewClass = EXClearingView
+ self.HuCardImg = setmetatable(HuCardImg, { __index = self.HuCardImg })
+
self.class = "MainView"
self.asset_group = "LiChuan_MJ"
+ self.HuCardImg_path = "ui://Extend_MJ_LiChuan/"
+ self.Sound_path = "extend/majiang/lichuan/sound/"
self:init()
ViewUtil.PlayMuisc(self.asset_group, "extend/majiang/lichuan/sound/bg.mp3")
return self
@@ -294,6 +299,8 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
_gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
+ MJMainView.OnHuCard(self, ...)
+ --[[
self._left_time = 0
self:UpdateCardBox(0)
self:__CloseTip()
@@ -388,7 +395,7 @@ function M:EventInit()
he:Dispose()
he_list:Dispose()
self._popEvent = true
- end)
+ end)]]
end)
_gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...)
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/HuCardImg.lua b/lua_probject/extend_project/extend/majiang/lichuan/HuCardImg.lua
new file mode 100644
index 00000000..d46d1513
--- /dev/null
+++ b/lua_probject/extend_project/extend/majiang/lichuan/HuCardImg.lua
@@ -0,0 +1,13 @@
+local HuCardImg = {}
+
+HuCardImg[6] = {"tile_cs_qidui"}
+HuCardImg[7] = {"tile_cs_tianhu"}
+HuCardImg[8] = {"tile_cs_dihu"}
+HuCardImg[9] = {"tile_cs_pinghu"}
+HuCardImg[10] = {"tile_cs_deguo"}
+HuCardImg[11] = {"tile_cs_qiangganghu"}
+HuCardImg[12] = {"tile_cs_gangshanghua"}
+HuCardImg[13] = {"tile_cs_quanqiuren"}
+
+
+return HuCardImg
\ No newline at end of file
diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
index 7c3aaea2..98e39341 100644
--- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
@@ -7,6 +7,7 @@ local TX_GameEvent = import(".GameEvent")
local HuTipView = import("main.majiang.HuTipView")
local SettingView = import(".EXSettingView")
local PlayerInfoView = import(".EXPlayerInfoView")
+local HuCardImg = import(".HuCardImg")
local M = {}
--- Create a new ZZ_MainView
@@ -16,8 +17,12 @@ function M.new()
self.EXClearingViewClass = EXClearingView
+ self.HuCardImg = setmetatable(HuCardImg, { __index = self.HuCardImg })
+
self.class = "MainView"
self.asset_group = "NanCheng_MJ"
+ self.HuCardImg_path = "ui://Extend_MJ_NanCheng/"
+ self.Sound_path = "extend/majiang/nancheng/sound/"
self:init()
ViewUtil.PlayMuisc(self.asset_group, "extend/majiang/nancheng/sound/bg.mp3")
return self
@@ -291,6 +296,8 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
_gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
+ MJMainView.OnHuCard(self, ...)
+ --[[
self._left_time = 0
self:UpdateCardBox(0)
self:__CloseTip()
@@ -387,6 +394,7 @@ function M:EventInit()
he_list:Dispose()
self._popEvent = true
end)
+ ]]
end)
_gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...)
diff --git a/lua_probject/extend_project/extend/majiang/nancheng/HuCardImg.lua b/lua_probject/extend_project/extend/majiang/nancheng/HuCardImg.lua
new file mode 100644
index 00000000..a262132d
--- /dev/null
+++ b/lua_probject/extend_project/extend/majiang/nancheng/HuCardImg.lua
@@ -0,0 +1,7 @@
+local HuCardImg = {}
+
+HuCardImg[15] = {"tile_cs_tianhu"}
+HuCardImg[16] = {"tile_cs_dihu"}
+HuCardImg[17] = {"tile_cs_pinghu"}
+
+return HuCardImg
\ No newline at end of file
diff --git a/lua_probject/main_project/main/majiang/HuCardImg.lua b/lua_probject/main_project/main/majiang/HuCardImg.lua
new file mode 100644
index 00000000..6728338e
--- /dev/null
+++ b/lua_probject/main_project/main/majiang/HuCardImg.lua
@@ -0,0 +1,29 @@
+local HuCardImg = {
+}
+
+HuCardImg[1] = { "tile_hu" }
+HuCardImg[2] = { "tile_zimo" }
+HuCardImg[3] = { "tile_cs_shisanlan" }
+HuCardImg[4] = { "tile_cs_qxshisanlan" }
+HuCardImg[5] = { "tile_cs_pengpenghu" }
+HuCardImg[6] = { "tile_cs_pengpenghu", "tile_cs_qingyise" }
+HuCardImg[7] = { "tile_cs_pengpenghu", "tile_cs_ziyise" }
+HuCardImg[8] = { "tile_cs_qidui" }
+HuCardImg[9] = { "tile_cs_qidui", "tile_cs_qingyise" }
+HuCardImg[10] = { "tile_cs_qidui", "tile_cs_ziyise" }
+HuCardImg[11] = { "tile_cs_qingyisezhenhu" }
+HuCardImg[12] = { "tile_cs_qingyisejiahu" }
+HuCardImg[13] = { "tile_cs_ziyisezhenhu" }
+HuCardImg[14] = { "tile_cs_ziyisejiahu" }
+HuCardImg[15] = { "缺失" }
+HuCardImg[16] = { "tile_cs_dihu" }
+HuCardImg[17] = { "tile_cs_pinghu" }
+HuCardImg[18] = { "tile_cs_qiangganghu" }
+HuCardImg[19] = { "tile_cs_gangshanghua" }
+HuCardImg[20] = { "缺失" }
+HuCardImg[21] = { "tile_cs_siguiyi" }
+HuCardImg[22] = { "tile_cs_baguiyi" }
+HuCardImg[23] = { "tile_cs_seguiyi" }
+HuCardImg[25] = { "tile_cs_seguiyi" , "tile_cs_qingyisezhenhu"}
+
+return HuCardImg
diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua
index 366b16b5..f92f9e05 100644
--- a/lua_probject/main_project/main/majiang/MJMainView.lua
+++ b/lua_probject/main_project/main/majiang/MJMainView.lua
@@ -5,6 +5,7 @@ local MJSettingView = import(".MJSettingViewNew")
local MJMainRightPanelView = import(".MJMainRightPanelView")
local MJCheckG = import('.MJCheckG')
local GameInfoWindow = import(".GameInfoWindow")
+local HuCardImg = import(".HuCardImg")
local bg_config = {
{ id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" },
@@ -16,6 +17,8 @@ local M = {}
setmetatable(M, { __index = MainView })
+M.HuCardImg = HuCardImg
+
local default_bg = 1
local function IsRoomOwer()
@@ -40,6 +43,14 @@ function M:InitView(url, use_custom_bg, custom_bg_config)
self._full = false
self._scale = true
MainView.InitView(self, url)
+
+ self.list_otherHuEffect = self._view:GetChild("list_otherHuEffect")
+ self.list_HuEffect = self._view:GetChild("list_HuEffect")
+ self.loader_otherHuCardEffect = self._view:GetChild("loader_otherHuCardEffect")
+ self.loader_selfHuCardEffect = self._view:GetChild("loader_selfHuCardEffect")
+ self.cHuCardEffect = self._view:GetController("cHuCardEffect")
+ self.effect_ZiMo = self._view:GetChild("effect_ZiMo")
+
self.btn_setting = self._view:GetChild("btn_setting")
local _view = self._view
self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj")
@@ -691,6 +702,112 @@ function M:OnResult1(...)
end
end
+function M:OnHuCard(...)
+ self._left_time = 0
+ self:UpdateCardBox(0)
+ self:__CloseTip()
+ self._popEvent = false
+ local arg = { ... }
+ local win_seat = arg[1]
+ local lose_seat = arg[2]
+ local win_card = arg[3]
+ local cards = arg[4]
+ local win_list = arg[5]
+ local index = self:GetPos(win_seat)
+ local info = self._player_card_info[index]
+ local player = self._room:GetPlayerBySeat(win_seat)
+ self:RemoveCursor()
+ --info:UpdateHandCard(false, false)
+ info:ShowHuCard(win_card)
+
+ self.cHuCardEffect.selectedIndex = 1
+
+ local loader_HuEffect = nil
+ local list_HuCardEffect = nil
+ if win_seat == self._room.self_player.seat then
+ loader_HuEffect = self.loader_selfHuCardEffect
+ list_HuCardEffect = self.list_HuEffect
+ else
+ loader_HuEffect = self.loader_otherHuCardEffect
+ list_HuCardEffect = self.list_otherHuEffect
+ end
+
+
+ ---
+ local isZiMo = win_seat == lose_seat
+ DataManager.CurrenRoom.isZiMoHu = isZiMo
+ local hu_sound = isZiMo and ("zimo") or ("hu")
+ printlog("声音====>>>", hu_sound)
+ self:PlaySound(self.asset_group, player.self_user.sex, hu_sound)
+
+ local effects = isZiMo and ("tile_zimo") or ("tile_hu")
+ loader_HuEffect.visible = true
+ loader_HuEffect.url = "ui://Main_Majiang/" .. effects
+ loader_HuEffect:SetScale(2, 2)
+ loader_HuEffect:TweenScale(Vector2(1, 1), 0.3):SetEase(EaseType.QuartOut)
+
+ self.effect_ZiMo.xy = loader_HuEffect.xy
+ self.effect_ZiMo:SetPlaySettings(0, -1, 1, -1);
+ self.effect_ZiMo.visible = true
+ self.effect_ZiMo.playing = true
+ self.effect_ZiMo.onPlayEnd:Set(function()
+ self.effect_ZiMo.visible = false
+ end)
+
+ coroutine.start(function()
+ coroutine.wait(1)
+
+ loader_HuEffect.visible = false
+ local Effects = {}
+ for i = 1, #win_list do
+ local HuMsg = win_list[i]
+
+ -- ↓↓↓先排列好特效图片
+ if HuMsg.type > 2 and HuMsg.type < 32 then
+ local sound_name = string.format(self.Sound_path .. "%s/%s.mp3",
+ ViewUtil.Sex_Chat[player.self_user.sex],
+ "he" .. HuMsg.type)
+ ViewUtil.PlaySound(self.asset_group, sound_name)
+
+ local imgList = self.HuCardImg[HuMsg.type]
+ for _, img in pairs(imgList) do
+ local imgPath = "ui://Main_Majiang/" .. img
+ local imgObj = list_HuCardEffect:AddItemFromPool()
+ local imgLoader = imgObj:GetChild("loader_img")
+ imgLoader.url = imgPath
+ imgObj.visible = false
+ Effects[#Effects + 1] = imgObj
+ end
+ end
+ end
+
+ -- ↓↓↓播放动画
+ for _, imgObj in pairs(Effects) do
+ imgObj.visible = true
+
+ local effect_xingxing = imgObj:GetChild("effect_xingxing")
+ effect_xingxing:SetPlaySettings(0, -1, 1, -1);
+ effect_xingxing.visible = true
+ effect_xingxing.playing = true
+ effect_xingxing.onPlayEnd:Set(function()
+ effect_xingxing.visible = false
+ end)
+
+ local imgLoader = imgObj:GetChild("loader_img")
+ imgLoader:SetScale(2, 2)
+ imgLoader:Center()
+ imgLoader:TweenScale(Vector2(1, 1), 0.3)
+ coroutine.wait(0.7)
+ end
+
+ coroutine.wait(0.5)
+ self._popEvent = true
+ list_HuCardEffect:RemoveChildrenToPool()
+
+ self.cHuCardEffect.selectedIndex = 0
+ end)
+end
+
function M:Show()
MainView.Show(self)
local win = GameInfoWindow.New()
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/com_huType.xml b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/com_huType.xml
new file mode 100644
index 00000000..0a547f2d
--- /dev/null
+++ b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/com_huType.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/eff_list1.xml b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/eff_list1.xml
index a9564165..35f5f1f6 100644
--- a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/eff_list1.xml
+++ b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/eff_list1.xml
@@ -1,15 +1,10 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he1.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he1.png
deleted file mode 100644
index 0e7eae2a..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he1.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he10.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he10.png
deleted file mode 100644
index 0d5e5e52..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he10.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he1_3.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he1_3.png
deleted file mode 100644
index 297d86a6..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he1_3.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he20.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he20.png
deleted file mode 100644
index 98c40d74..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he20.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he24.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he24.png
deleted file mode 100644
index a7a09156..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he24.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he25.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he25.png
deleted file mode 100644
index a1a61a6c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he25.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he26.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he26.png
deleted file mode 100644
index cbf2fed8..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he26.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he27.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he27.png
deleted file mode 100644
index 69c2860e..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he27.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he28.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he28.png
deleted file mode 100644
index 43d3419d..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he28.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he29.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he29.png
deleted file mode 100644
index ad00cc0f..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he29.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he30.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he30.png
deleted file mode 100644
index cb6adb57..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he30.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he31.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he31.png
deleted file mode 100644
index 4b20b03b..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he31.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he32.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he32.png
deleted file mode 100644
index 3aee4a78..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he32.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he33.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he33.png
deleted file mode 100644
index 7531360d..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he33.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he34.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he34.png
deleted file mode 100644
index 621a188e..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he34.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he35.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he35.png
deleted file mode 100644
index 7f3e6ef1..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he35.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he36.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he36.png
deleted file mode 100644
index 66598a4e..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he36.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he37.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he37.png
deleted file mode 100644
index d0a02cd9..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he37.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he38.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he38.png
deleted file mode 100644
index 17766357..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he38.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he39.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he39.png
deleted file mode 100644
index 4ab8f4ed..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he39.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he40.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he40.png
deleted file mode 100644
index 82a22595..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he40.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he41.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he41.png
deleted file mode 100644
index 441e806f..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he41.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he42.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he42.png
deleted file mode 100644
index 771e94f5..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he42.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he43.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he43.png
deleted file mode 100644
index 4d2bf4b0..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he43.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he44.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he44.png
deleted file mode 100644
index 554b5e8e..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he44.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he6.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he6.png
deleted file mode 100644
index 8145c5a3..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he6.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he7.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he7.png
deleted file mode 100644
index d2f82324..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he7.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he9.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he9.png
deleted file mode 100644
index a948c166..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he9.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he_4w.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he_4w.png
deleted file mode 100644
index 13e2291c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he_4w.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/xingxing.jta b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/xingxing.jta
new file mode 100644
index 00000000..b2ea0431
Binary files /dev/null and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/xingxing.jta differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/package.xml b/wb_new_ui/assets/Extend_MJ_FuZhou/package.xml
index 6f2637ef..38a2d687 100644
--- a/wb_new_ui/assets/Extend_MJ_FuZhou/package.xml
+++ b/wb_new_ui/assets/Extend_MJ_FuZhou/package.xml
@@ -1,7 +1,6 @@
-
@@ -196,53 +195,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he1.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he1.png
deleted file mode 100644
index 0e7eae2a..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he1.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he10.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he10.png
deleted file mode 100644
index 0d5e5e52..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he10.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he11.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he11.png
deleted file mode 100644
index 43915c2f..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he11.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he12.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he12.png
deleted file mode 100644
index 6549fc89..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he12.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he13.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he13.png
deleted file mode 100644
index 6c7c4399..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he13.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he14.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he14.png
deleted file mode 100644
index bd935d80..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he14.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he15.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he15.png
deleted file mode 100644
index 57c260de..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he15.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he16.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he16.png
deleted file mode 100644
index f339999c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he16.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he17.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he17.png
deleted file mode 100644
index 7c44e190..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he17.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he18.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he18.png
deleted file mode 100644
index 4d43148c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he18.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he19.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he19.png
deleted file mode 100644
index ae590422..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he19.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he1_3.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he1_3.png
deleted file mode 100644
index 297d86a6..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he1_3.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he2.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he2.png
deleted file mode 100644
index 9c27b6d0..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he2.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he20.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he20.png
deleted file mode 100644
index e7ea9c43..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he20.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he21.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he21.png
deleted file mode 100644
index 360f4e0d..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he21.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he22.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he22.png
deleted file mode 100644
index cf57f544..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he22.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he23.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he23.png
deleted file mode 100644
index 0bab8ace..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he23.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he24.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he24.png
deleted file mode 100644
index 0453b8c4..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he24.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he25.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he25.png
deleted file mode 100644
index ee90cc3a..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he25.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he26.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he26.png
deleted file mode 100644
index 9488cbcc..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he26.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he27.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he27.png
deleted file mode 100644
index e8690f5f..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he27.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he28.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he28.png
deleted file mode 100644
index e247f62c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he28.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he29.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he29.png
deleted file mode 100644
index 2b89da9b..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he29.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he3.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he3.png
deleted file mode 100644
index 189107b0..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he3.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he30.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he30.png
deleted file mode 100644
index ef45d4c7..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he30.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he31.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he31.png
deleted file mode 100644
index a59d486a..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he31.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he4.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he4.png
deleted file mode 100644
index 65262d59..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he4.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he5.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he5.png
deleted file mode 100644
index b788619e..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he5.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he6.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he6.png
deleted file mode 100644
index 8145c5a3..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he6.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he7.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he7.png
deleted file mode 100644
index d2f82324..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he7.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he8.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he8.png
deleted file mode 100644
index dab9b4fe..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he8.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he9.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he9.png
deleted file mode 100644
index a948c166..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he9.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he_4w.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he_4w.png
deleted file mode 100644
index 13e2291c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he_4w.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/package.xml b/wb_new_ui/assets/Extend_MJ_JinXi/package.xml
index a054e5fd..98cf413c 100644
--- a/wb_new_ui/assets/Extend_MJ_JinXi/package.xml
+++ b/wb_new_ui/assets/Extend_MJ_JinXi/package.xml
@@ -195,39 +195,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he1.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he1.png
deleted file mode 100644
index 0e7eae2a..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he1.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he10.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he10.png
deleted file mode 100644
index e92b1fa0..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he10.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he11.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he11.png
deleted file mode 100644
index ba845a39..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he11.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he12.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he12.png
deleted file mode 100644
index e33dda0c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he12.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he13.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he13.png
deleted file mode 100644
index 4310d9fa..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he13.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he14.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he14.png
deleted file mode 100644
index 3c611dc3..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he14.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he15.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he15.png
deleted file mode 100644
index 3109e11c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he15.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he16.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he16.png
deleted file mode 100644
index 27dc201d..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he16.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he17.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he17.png
deleted file mode 100644
index b9023450..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he17.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he18.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he18.png
deleted file mode 100644
index 4d43148c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he18.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he19.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he19.png
deleted file mode 100644
index ae590422..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he19.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he1_3.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he1_3.png
deleted file mode 100644
index 297d86a6..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he1_3.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he2.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he2.png
deleted file mode 100644
index 9c27b6d0..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he2.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he20.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he20.png
deleted file mode 100644
index e7ea9c43..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he20.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he21.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he21.png
deleted file mode 100644
index 360f4e0d..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he21.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he22.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he22.png
deleted file mode 100644
index cf57f544..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he22.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he23.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he23.png
deleted file mode 100644
index 0bab8ace..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he23.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he24.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he24.png
deleted file mode 100644
index 0453b8c4..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he24.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he25.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he25.png
deleted file mode 100644
index ee90cc3a..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he25.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he26.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he26.png
deleted file mode 100644
index 9488cbcc..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he26.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he27.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he27.png
deleted file mode 100644
index e8690f5f..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he27.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he28.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he28.png
deleted file mode 100644
index e247f62c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he28.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he29.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he29.png
deleted file mode 100644
index 2b89da9b..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he29.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he3.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he3.png
deleted file mode 100644
index 189107b0..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he3.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he30.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he30.png
deleted file mode 100644
index ef45d4c7..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he30.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he31.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he31.png
deleted file mode 100644
index a59d486a..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he31.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he4.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he4.png
deleted file mode 100644
index 65262d59..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he4.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he5.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he5.png
deleted file mode 100644
index b788619e..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he5.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he6.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he6.png
deleted file mode 100644
index dab9b4fe..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he6.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he7.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he7.png
deleted file mode 100644
index 57c260de..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he7.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he8.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he8.png
deleted file mode 100644
index f339999c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he8.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he9.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he9.png
deleted file mode 100644
index 7c44e190..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he9.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he_4w.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he_4w.png
deleted file mode 100644
index 13e2291c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he_4w.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/package.xml b/wb_new_ui/assets/Extend_MJ_LiChuan/package.xml
index 40b652f9..b1388ff3 100644
--- a/wb_new_ui/assets/Extend_MJ_LiChuan/package.xml
+++ b/wb_new_ui/assets/Extend_MJ_LiChuan/package.xml
@@ -195,39 +195,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he1.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he1.png
deleted file mode 100644
index 0e7eae2a..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he1.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he10.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he10.png
deleted file mode 100644
index 0d5e5e52..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he10.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he11.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he11.png
deleted file mode 100644
index 43915c2f..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he11.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he12.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he12.png
deleted file mode 100644
index 6549fc89..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he12.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he13.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he13.png
deleted file mode 100644
index 6c7c4399..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he13.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he14.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he14.png
deleted file mode 100644
index bd935d80..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he14.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he15.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he15.png
deleted file mode 100644
index 57c260de..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he15.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he16.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he16.png
deleted file mode 100644
index f339999c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he16.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he17.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he17.png
deleted file mode 100644
index 7c44e190..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he17.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he18.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he18.png
deleted file mode 100644
index 4d43148c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he18.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he19.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he19.png
deleted file mode 100644
index ae590422..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he19.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he1_3.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he1_3.png
deleted file mode 100644
index 297d86a6..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he1_3.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he2.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he2.png
deleted file mode 100644
index 9c27b6d0..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he2.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he20.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he20.png
deleted file mode 100644
index e7ea9c43..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he20.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he21.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he21.png
deleted file mode 100644
index 360f4e0d..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he21.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he22.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he22.png
deleted file mode 100644
index cf57f544..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he22.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he23.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he23.png
deleted file mode 100644
index 0bab8ace..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he23.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he24.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he24.png
deleted file mode 100644
index 0453b8c4..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he24.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he25.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he25.png
deleted file mode 100644
index ee90cc3a..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he25.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he26.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he26.png
deleted file mode 100644
index 9488cbcc..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he26.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he27.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he27.png
deleted file mode 100644
index e8690f5f..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he27.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he28.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he28.png
deleted file mode 100644
index e247f62c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he28.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he29.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he29.png
deleted file mode 100644
index 2b89da9b..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he29.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he3.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he3.png
deleted file mode 100644
index 189107b0..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he3.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he30.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he30.png
deleted file mode 100644
index ef45d4c7..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he30.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he31.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he31.png
deleted file mode 100644
index a59d486a..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he31.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he4.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he4.png
deleted file mode 100644
index 65262d59..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he4.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he5.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he5.png
deleted file mode 100644
index b788619e..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he5.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he6.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he6.png
deleted file mode 100644
index 8145c5a3..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he6.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he7.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he7.png
deleted file mode 100644
index d2f82324..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he7.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he8.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he8.png
deleted file mode 100644
index dab9b4fe..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he8.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he9.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he9.png
deleted file mode 100644
index a948c166..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he9.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he_4w.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he_4w.png
deleted file mode 100644
index 13e2291c..00000000
Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he_4w.png and /dev/null differ
diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/package.xml b/wb_new_ui/assets/Extend_MJ_NanCheng/package.xml
index ffe711a5..258d28e6 100644
--- a/wb_new_ui/assets/Extend_MJ_NanCheng/package.xml
+++ b/wb_new_ui/assets/Extend_MJ_NanCheng/package.xml
@@ -195,43 +195,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_baoting.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_baoting.png
new file mode 100644
index 00000000..7dfbe51c
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_baoting.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he22.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_baguiyi.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he22.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_baguiyi.png
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_deguo.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_deguo.png
new file mode 100644
index 00000000..b79fcf24
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_deguo.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he16.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_dihu.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he16.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_dihu.png
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he19.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_gangshanghua.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he19.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_gangshanghua.png
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_haidi.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_haidi.png
new file mode 100644
index 00000000..32405f2c
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_haidi.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_jiangjianghu.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_jiangjianghu.png
new file mode 100644
index 00000000..99ad6656
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_jiangjianghu.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he5.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_pengpenghu.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he5.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_pengpenghu.png
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_pengpenghuDanDiao.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_pengpenghuDanDiao.png
new file mode 100644
index 00000000..b3d3bc46
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_pengpenghuDanDiao.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_pihu.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_pihu.png
new file mode 100644
index 00000000..8b870f20
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_pihu.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he17.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_pinghu.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he17.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_pinghu.png
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he18.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qiangganghu.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he18.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qiangganghu.png
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he8.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qidui.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he8.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qidui.png
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qidui_chaoji.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qidui_chaoji.png
new file mode 100644
index 00000000..ebbc1346
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qidui_chaoji.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qidui_haohua.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qidui_haohua.png
new file mode 100644
index 00000000..cfac9c5c
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qidui_haohua.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qingyise.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qingyise.png
new file mode 100644
index 00000000..8e55545d
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qingyise.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he12.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qingyisejiahu.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he12.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qingyisejiahu.png
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he11.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qingyisezhenhu.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he11.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qingyisezhenhu.png
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_quanqiuren.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_quanqiuren.png
new file mode 100644
index 00000000..0b167fb9
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_quanqiuren.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he4.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qxshisanlan.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he4.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_qxshisanlan.png
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he23.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_seguiyi.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he23.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_seguiyi.png
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he3.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_shisanlan.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he3.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_shisanlan.png
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he21.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_siguiyi.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he21.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_siguiyi.png
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he15.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_tianhu.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he15.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_tianhu.png
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_ziyise.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_ziyise.png
new file mode 100644
index 00000000..c2ef6d13
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_ziyise.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he14.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_ziyisejiahu.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he14.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_ziyisejiahu.png
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he13.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_ziyisezhenhu.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he13.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_cs_ziyisezhenhu.png
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_hu.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_hu.png
new file mode 100644
index 00000000..68f7924d
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_hu.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_menqing.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_menqing.png
new file mode 100644
index 00000000..3197ef12
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_menqing.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_yitiaolong.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_yitiaolong.png
new file mode 100644
index 00000000..5ceb4814
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_yitiaolong.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he2.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_zimo.png
similarity index 100%
rename from wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he2.png
rename to wb_new_ui/assets/Main_Majiang/Main_new/Image/HuCardEffect/tile_zimo.png
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/com_huType.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/com_huType.xml
new file mode 100644
index 00000000..6f663727
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/com_huType.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/eff_list1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/eff_list1.xml
new file mode 100644
index 00000000..f9c4ff38
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/eff_list1.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/xingxing.jta b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/xingxing.jta
new file mode 100644
index 00000000..a1451916
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/xingxing.jta differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Effect_ZiMo.jta b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Effect_ZiMo.jta
new file mode 100644
index 00000000..b443a956
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Effect_ZiMo.jta differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
index cfe15b89..10d47715 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
@@ -1,5 +1,5 @@
-
+
@@ -9,6 +9,10 @@
+
+
+
+
@@ -263,5 +267,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/image/com_hePaiEffect.xml b/wb_new_ui/assets/Main_Majiang/image/com_hePaiEffect.xml
new file mode 100644
index 00000000..33f3f1f9
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/image/com_hePaiEffect.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/package.xml b/wb_new_ui/assets/Main_Majiang/package.xml
index b9fdeb40..b5f0d79f 100644
--- a/wb_new_ui/assets/Main_Majiang/package.xml
+++ b/wb_new_ui/assets/Main_Majiang/package.xml
@@ -1487,12 +1487,46 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Poker/package.xml b/wb_new_ui/assets/Main_Poker/package.xml
index 7acee9a1..040f3f37 100644
--- a/wb_new_ui/assets/Main_Poker/package.xml
+++ b/wb_new_ui/assets/Main_Poker/package.xml
@@ -230,6 +230,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png
index f52bd4d8..8ac7b989 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png
index 593ac357..61a8f391 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png
index 17e19bff..618fd7ae 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png
index 11280d0f..191d5e98 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png
index 7f66c9e0..b1dac1df 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png
index bc537328..6a4375be 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_whhc1fo.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_whhc1fo.png
new file mode 100644
index 00000000..6c0585d4
Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_whhc1fo.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_whhc1fo.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_whhc1fo.png.meta
new file mode 100644
index 00000000..04cf068a
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_whhc1fo.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: df7f01ded94712b4ab299b449799c973
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
index 638220d5..45c12e84 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas0.png
index 3446b576..d3ff9815 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes
index 9bdf55d1..3edb311e 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png
index d2b39c15..5ad095f2 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes
index c00ab6b5..ba80b7e4 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png
index bb877338..b4c1b2df 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes
index 3aa13246..26abc784 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png
index d0fa7666..7df52f64 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes
index 8232417c..cea3eb12 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes differ
diff --git a/wb_unity_pro/Assets/Scripts/Editor/CustomSettings.cs b/wb_unity_pro/Assets/Scripts/Editor/CustomSettings.cs
index e56f98bb..1631bb30 100644
--- a/wb_unity_pro/Assets/Scripts/Editor/CustomSettings.cs
+++ b/wb_unity_pro/Assets/Scripts/Editor/CustomSettings.cs
@@ -229,6 +229,7 @@ public static class CustomSettings
_GT(typeof(Image)),
_GT(typeof(FairyGUI.TextField)),
_GT(typeof(EmojiDitc)),
+ _GT(typeof(EaseType)),
};
public static List dynamicList = new List()
diff --git a/wb_unity_pro/Assets/Source/Generate/FairyGUI_EaseTypeWrap.cs b/wb_unity_pro/Assets/Source/Generate/FairyGUI_EaseTypeWrap.cs
new file mode 100644
index 00000000..a1da6a9b
--- /dev/null
+++ b/wb_unity_pro/Assets/Source/Generate/FairyGUI_EaseTypeWrap.cs
@@ -0,0 +1,291 @@
+//this source code was auto-generated by tolua#, do not modify it
+using System;
+using LuaInterface;
+
+public class FairyGUI_EaseTypeWrap
+{
+ public static void Register(LuaState L)
+ {
+ L.BeginEnum(typeof(FairyGUI.EaseType));
+ L.RegVar("Linear", get_Linear, null);
+ L.RegVar("SineIn", get_SineIn, null);
+ L.RegVar("SineOut", get_SineOut, null);
+ L.RegVar("SineInOut", get_SineInOut, null);
+ L.RegVar("QuadIn", get_QuadIn, null);
+ L.RegVar("QuadOut", get_QuadOut, null);
+ L.RegVar("QuadInOut", get_QuadInOut, null);
+ L.RegVar("CubicIn", get_CubicIn, null);
+ L.RegVar("CubicOut", get_CubicOut, null);
+ L.RegVar("CubicInOut", get_CubicInOut, null);
+ L.RegVar("QuartIn", get_QuartIn, null);
+ L.RegVar("QuartOut", get_QuartOut, null);
+ L.RegVar("QuartInOut", get_QuartInOut, null);
+ L.RegVar("QuintIn", get_QuintIn, null);
+ L.RegVar("QuintOut", get_QuintOut, null);
+ L.RegVar("QuintInOut", get_QuintInOut, null);
+ L.RegVar("ExpoIn", get_ExpoIn, null);
+ L.RegVar("ExpoOut", get_ExpoOut, null);
+ L.RegVar("ExpoInOut", get_ExpoInOut, null);
+ L.RegVar("CircIn", get_CircIn, null);
+ L.RegVar("CircOut", get_CircOut, null);
+ L.RegVar("CircInOut", get_CircInOut, null);
+ L.RegVar("ElasticIn", get_ElasticIn, null);
+ L.RegVar("ElasticOut", get_ElasticOut, null);
+ L.RegVar("ElasticInOut", get_ElasticInOut, null);
+ L.RegVar("BackIn", get_BackIn, null);
+ L.RegVar("BackOut", get_BackOut, null);
+ L.RegVar("BackInOut", get_BackInOut, null);
+ L.RegVar("BounceIn", get_BounceIn, null);
+ L.RegVar("BounceOut", get_BounceOut, null);
+ L.RegVar("BounceInOut", get_BounceInOut, null);
+ L.RegVar("Custom", get_Custom, null);
+ L.RegFunction("IntToEnum", IntToEnum);
+ L.EndEnum();
+ TypeTraits.Check = CheckType;
+ StackTraits.Push = Push;
+ }
+
+ static void Push(IntPtr L, FairyGUI.EaseType arg)
+ {
+ ToLua.Push(L, arg);
+ }
+
+ static bool CheckType(IntPtr L, int pos)
+ {
+ return TypeChecker.CheckEnumType(typeof(FairyGUI.EaseType), L, pos);
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_Linear(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.Linear);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_SineIn(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.SineIn);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_SineOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.SineOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_SineInOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.SineInOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_QuadIn(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.QuadIn);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_QuadOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.QuadOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_QuadInOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.QuadInOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_CubicIn(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.CubicIn);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_CubicOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.CubicOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_CubicInOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.CubicInOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_QuartIn(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.QuartIn);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_QuartOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.QuartOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_QuartInOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.QuartInOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_QuintIn(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.QuintIn);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_QuintOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.QuintOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_QuintInOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.QuintInOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_ExpoIn(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.ExpoIn);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_ExpoOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.ExpoOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_ExpoInOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.ExpoInOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_CircIn(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.CircIn);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_CircOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.CircOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_CircInOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.CircInOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_ElasticIn(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.ElasticIn);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_ElasticOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.ElasticOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_ElasticInOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.ElasticInOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_BackIn(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.BackIn);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_BackOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.BackOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_BackInOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.BackInOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_BounceIn(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.BounceIn);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_BounceOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.BounceOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_BounceInOut(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.BounceInOut);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_Custom(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.EaseType.Custom);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int IntToEnum(IntPtr L)
+ {
+ int arg0 = (int)LuaDLL.lua_tonumber(L, 1);
+ FairyGUI.EaseType o = (FairyGUI.EaseType)arg0;
+ ToLua.Push(L, o);
+ return 1;
+ }
+}
+
diff --git a/wb_unity_pro/Assets/Source/Generate/FairyGUI_EaseTypeWrap.cs.meta b/wb_unity_pro/Assets/Source/Generate/FairyGUI_EaseTypeWrap.cs.meta
new file mode 100644
index 00000000..bb227cff
--- /dev/null
+++ b/wb_unity_pro/Assets/Source/Generate/FairyGUI_EaseTypeWrap.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 86b60441a6cab0a4491ebd3b09e39af9
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/wb_unity_pro/Assets/Source/Generate/LuaBinder.cs b/wb_unity_pro/Assets/Source/Generate/LuaBinder.cs
index 937d79f2..8aa2890d 100644
--- a/wb_unity_pro/Assets/Source/Generate/LuaBinder.cs
+++ b/wb_unity_pro/Assets/Source/Generate/LuaBinder.cs
@@ -135,6 +135,7 @@ public static class LuaBinder
FairyGUI_GTweenerWrap.Register(L);
FairyGUI_ImageWrap.Register(L);
FairyGUI_TextFieldWrap.Register(L);
+ FairyGUI_EaseTypeWrap.Register(L);
FairyGUI_GearBaseWrap.Register(L);
FairyGUI_BaseFontWrap.Register(L);
L.RegFunction("GTweenCallback", FairyGUI_GTweenCallback);
diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json
index dbe4feae..af385fff 100644
--- a/wb_unity_pro/Assets/StreamingAssets/init2_1.json
+++ b/wb_unity_pro/Assets/StreamingAssets/init2_1.json
@@ -1,109 +1,109 @@
[
{
"lua_path": "/tolua_project,/base_project,/main_project",
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "base_script",
"check": true,
"bundle": "base/base_script",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "common",
"check": true,
"bundle": "base/common",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "login",
"check": true,
"bundle": "base/login",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "lobby",
"check": true,
"bundle": "base/lobby",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "Family",
"check": true,
"bundle": "base/Family",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "chat",
"check": true,
"bundle": "base/chat",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "newgroup",
"check": true,
"bundle": "base/newgroup",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "rank",
"check": true,
- "version": "1.0.6",
+ "version": "1.0.8",
"bundle": "base/rank"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "main_majiang",
"check": true,
- "version": "1.0.6",
+ "version": "1.0.8",
"bundle": "base/main_majiang"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "main_poker",
"check": true,
- "version": "1.0.6",
+ "version": "1.0.8",
"bundle": "base/main_poker"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "main_zipai",
"check": true,
- "version": "1.0.6",
+ "version": "1.0.8",
"bundle": "base/main_zipai"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "static",
"check": true,
"bundle": "base/static",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"is_res": true,
"name": "embed",
"check": true,
"bundle": "base/embed",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "main_pokemajiang",
"check": true,
- "version": "1.0.6",
+ "version": "1.0.8",
"bundle": "base/main_pokemajiang"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "main_zipaimajiang",
"check": true,
- "version": "1.0.6",
+ "version": "1.0.8",
"bundle": "base/main_zipaimajiang"
}
]
diff --git a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset
index a7bcfc3d..4da061a7 100644
--- a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset
+++ b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset
@@ -39,6 +39,7 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
diff --git a/wb_unity_pro/ProjectSettings/NavMeshLayers.asset b/wb_unity_pro/ProjectSettings/NavMeshLayers.asset
new file mode 100644
index 00000000..5fc3f29a
Binary files /dev/null and b/wb_unity_pro/ProjectSettings/NavMeshLayers.asset differ
diff --git a/wb_unity_pro/ProjectSettings/NetworkManager.asset b/wb_unity_pro/ProjectSettings/NetworkManager.asset
new file mode 100644
index 00000000..5dc6a831
--- /dev/null
+++ b/wb_unity_pro/ProjectSettings/NetworkManager.asset
@@ -0,0 +1,8 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!149 &1
+NetworkManager:
+ m_ObjectHideFlags: 0
+ m_DebugLevel: 0
+ m_Sendrate: 15
+ m_AssetToPrefab: {}