diff --git a/lua_probject/base_project/Game/View/PlayerInfoView.lua b/lua_probject/base_project/Game/View/PlayerInfoView.lua
index 7d9ccf7b..ef0300b2 100644
--- a/lua_probject/base_project/Game/View/PlayerInfoView.lua
+++ b/lua_probject/base_project/Game/View/PlayerInfoView.lua
@@ -101,12 +101,11 @@ function M:init()
end
end
-
function M:showmmm()
- if self.totalTime>0 then
+ if self.totalTime > 0 then
self.starttimeflag = false
self.totalTime = self.totalTime - 0.0165
- if self.totalTime<60 then
+ if self.totalTime < 60 then
if self.PlayerTGBg and self.PlayerTGBg.displayObject.gameObject then
self.PlayerTGBg.displayObject.gameObject:SetActive(true)
end
@@ -114,29 +113,26 @@ function M:showmmm()
self.PlayerTGBorder.displayObject.gameObject:SetActive(true)
end
if self.PlayerTGBg then
- self.PlayerTGBg.max = self.maxTime
- self.PlayerTGBg.value =self.maxTime - self.totalTime
+ self.PlayerTGBg.max = self.maxTime
+ self.PlayerTGBg.value = self.maxTime - self.totalTime
end
if self.PlayerTGBorder then
self.PlayerTGBorder.max = self.maxTime
self.PlayerTGBorder.value = self.totalTime
end
-
end
-
else
if self.PlayerTGBg and self.PlayerTGBg.displayObject.gameObject then
self.PlayerTGBg.displayObject.gameObject:SetActive(false)
end
- if self.PlayerTGBorder and self.PlayerTGBorder.displayObject.gameObject then
+ if self.PlayerTGBorder and self.PlayerTGBorder.displayObject.gameObject then
self.PlayerTGBorder.displayObject.gameObject:SetActive(false)
- end
+ end
end
-
end
function M:IsShowTGTips(isShow, time)
- printlog("isShowisShowisShow==== ",isShow," time ",time)
+ printlog("isShowisShowisShow==== ", isShow, " time ", time)
if time == nil then time = 0 end
self.totalTime = time
self.isShowTGTimer = isShow
@@ -150,7 +146,7 @@ function M:IsShowTGTips(isShow, time)
self.PlayerTGBorder.displayObject.gameObject:SetActive(false)
end
self.currentTime = 0
-
+
if isShow then
if self.PlayerTGTips then
self.PlayerTGTips.text = "开启托管剩余时间" .. time .. "s"
@@ -158,17 +154,17 @@ function M:IsShowTGTips(isShow, time)
self.maxTime = time
- if self.timer~=nil then
+ if self.timer ~= nil then
self.timer:Stop()
end
self.timer = FrameTimer.New(function()
self:showmmm()
end, 0.1, -1, false)
self.timer:Start()
-
-
-
- --[[ if self.PlayerTGBg then
+
+
+
+ --[[ if self.PlayerTGBg then
self.PlayerTGBg.max = time
end
if self.PlayerTGBorder then
@@ -179,16 +175,15 @@ function M:IsShowTGTips(isShow, time)
--UpdateBeat:Add(self.OnUpdate,self)
-- printlog("aaaaaaaaa111111111111111111111111111111")
--TimerManager.RemoveTimer(self.OnUpdate)
- -- TimerManager.AddTimer(self.OnUpdate, self)
+ -- TimerManager.AddTimer(self.OnUpdate, self)
--printlog(self)
else
-
- if self.timer~=nil then
+ if self.timer ~= nil then
self.timer:Stop()
end
-- printlog("移除IsShowTGTips",self.isShow)
--UpdateBeat:Remove(self.OnUpdate,self)
- -- TimerManager.RemoveTimer(self.OnUpdate, self)
+ -- TimerManager.RemoveTimer(self.OnUpdate, self)
end
end
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml
index 6bead898..8d9d4664 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/bg.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/bg.png
new file mode 100644
index 00000000..0e11f5b3
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/bg.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_1.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_1.xml
index de9fbcac..4709e55d 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_1.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_1.xml
@@ -10,6 +10,7 @@
+
@@ -19,9 +20,12 @@
-
+
+
+
+
@@ -55,11 +59,17 @@
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_2.xml
index 3c6cad9b..d979c737 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_2.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_2.xml
@@ -11,6 +11,7 @@
+
@@ -20,7 +21,7 @@
-
+
@@ -59,11 +60,20 @@
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/pb_tuoGuan_Bg.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/pb_tuoGuan_Bg.xml
new file mode 100644
index 00000000..e7ccd639
--- /dev/null
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/pb_tuoGuan_Bg.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/pb_tuoGuan_Border.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/pb_tuoGuan_Border.xml
new file mode 100644
index 00000000..4156a356
--- /dev/null
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/pb_tuoGuan_Border.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/tuoguan.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/tuoguan.png
new file mode 100644
index 00000000..b4abc879
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/tuoguan.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
index 0be9aad1..f3cbea8b 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
@@ -463,6 +463,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_1.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_1.xml
index 17eedf15..93b6363a 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_1.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_1.xml
@@ -6,7 +6,7 @@
-
+
@@ -25,7 +25,7 @@
-
+
@@ -43,7 +43,7 @@
-
+