重连修复，动画调整，小三角标

lua_probject/base_project/Game/Controller/LoddyController.lua

@@ -261,6 +261,7 @@ function M:UpdatePlayerInfo(callback)
 		if res.ReturnCode == 0 then
 			DataManager.SelfUser.diamo = res.Data.diamo
 			DataManager.SelfUser.invited = res.Data.invitation
+			DataManager.SelfUser.group_id = res.Data.groupId
 			if callback then callback(true, res.Data) end
 			-- DataManager.SelfUser.raffle = res.Data.raffle
 		else

lua_probject/base_project/Game/View/LobbyView.lua

@@ -448,19 +448,19 @@ function M:Show()
     ViewUtil.PlaySoundBg()
     UpdateBeat:Add(self.OnUpdate, self)
 
+    -- 旧重连
+    --[[
     -- 如果在圈子内的房间，显示tip
     local user = DataManager.SelfUser
     local tem = user.notices
     if user.group_id ~= 0 then
         self:ReconnectRoom(user.group_id)
-        --[[
         local msg_tip = MsgWindow.new(self._root_view, "还在圈子的房间中，现在重连吗？", MsgWindow.MsgMode.OkAndCancel)
         msg_tip.onOk:Add(function()
             self:ReconnectRoom(user.group_id)
         end)
         msg_tip:Show()
         tem.auto_show = false
-        ]]
     else
         local lobbyCtr1 = ControllerManager.GetController(LoddyController)
         lobbyCtr1:UpdateNotice(DataManager.SelfUser.account_id, function(result, data)
@@ -472,9 +472,10 @@ function M:Show()
             end
         end)
     end
+    ]]
 
     local loddyCtr1 = ControllerManager.GetController(LoddyController)
-    self:GetPlayerInfoData()
+    --self:GetPlayerInfoData()
 
     -- 获取GPS坐标
     if not DataManager.SelfUser.location or DataManager.SelfUser.location:Location2String() == "" then
@@ -484,6 +485,8 @@ function M:Show()
     if self.groupMainView and self.groupMainView._groupInfoView then
         self.groupMainView._groupInfoView:hidePipei()
     end
+
+    self:GetPlayerInfoData()
 end
 
 function M:GetPlayerInfoData()
@@ -491,6 +494,10 @@ function M:GetPlayerInfoData()
     loddyCtr1:UpdatePlayerInfo(function(result, data)
         if result then
             self:ShowPlayerInfo(data.raffle, data.diamo, data.newMail)
+            if data.group_id ~= 0 then
+                -- 重连
+                self:ReconnectRoom(data.groupId)
+            end
         end
     end)
 end

lua_probject/base_project/Game/View/MainView.lua

@@ -39,7 +39,7 @@ end
 local function LoadClickData()
     local json_data = Utils.LoadLocalFile("clickMode")
 
-    if json_data == "null" then 
+    if json_data == nil or json_data == "null" then 
         return "double"
     end
 

lua_probject/base_project/Game/View/PlayerInfoView.lua

@@ -399,9 +399,9 @@ function M:ScoreAnimation(score)
     ), 2):OnComplete(function()
         self._list_scoreAnimation.xy = Rxy
         self.cScore.selectedIndex = 0
-    end)
+        self._list_scoreAnimation:TweenFade(0, 4):OnComplete(function()
-    self._list_scoreAnimation:TweenFade(0, 6):OnComplete(function()
+            self._list_scoreAnimation:TweenFade(1, 1)
-        self._list_scoreAnimation:TweenFade(1, 0)
+        end)
     end)
 end
 

lua_probject/base_project/Game/View/PlayerInfoView2.lua

@@ -398,9 +398,9 @@ function M:ScoreAnimation(score)
     ), 2):OnComplete(function()
         self._list_scoreAnimation.xy = Rxy
         self.cScore.selectedIndex = 0
-    end)
+        self._list_scoreAnimation:TweenFade(0, 4):OnComplete(function()
-    self._list_scoreAnimation:TweenFade(0, 6):OnComplete(function()
+            self._list_scoreAnimation:TweenFade(1, 1)
-        self._list_scoreAnimation:TweenFade(1, 0)
+        end)
     end)
 end
 

wb_new_ui/assets/Common/MessageBox.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="682,406">
+<component size="1182,552">
   <displayList>
-    <component id="n20_xblm" name="btn_close1" src="xblm7jbn" fileName="buttons/btn_bg.xml" xy="-1159,-547" size="3000,1500"/>
+    <component id="n20_xblm" name="btn_close1" src="xblm7jbn" fileName="buttons/btn_bg.xml" xy="-909,-474" size="3000,1500"/>
-    <image id="n19_nuxq" name="bg" src="xblm7jbk" fileName="images/bg.png" xy="0,0" size="682,406">
+    <image id="n19_nuxq" name="bg" src="xblm7jbk" fileName="images/bg.png" xy="0,0" size="1182,552">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <richtext id="n7_m0vo" name="tex_message" xy="41,110" size="600,151" font="Alimama FangYuanTi VF" fontSize="36" color="#614103" align="center" vAlign="middle" ubb="true" autoSize="none" text="空间和空间&#xA;空间和空间"/>
+    <component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="182,381" size="309,114" group="n8_m0vo">
-    <component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="86,272" size="235,92" group="n8_m0vo">
       <Button title=" " icon="ui://27vd145bxblm7jbl"/>
     </component>
-    <component id="n15_cvc8" name="btn_close" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="361,272" size="235,92" group="n8_m0vo">
+    <component id="n15_cvc8" name="btn_close" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="691,381" size="309,114" group="n8_m0vo">
       <Button title=" " icon="ui://27vd145bxblm7jbm"/>
     </component>
-    <group id="n8_m0vo" name="n8" xy="86,272" size="510,92"/>
+    <group id="n8_m0vo" name="n8" xy="182,381" size="818,114"/>
-    <component id="n17_vtgq" name="btnCheck" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="286,324" visible="false">
+    <component id="n17_vtgq" name="btnCheck" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="-2050,324" visible="false">
       <Button title="设置全部"/>
     </component>
+    <richtext id="n21_f8c3" name="tex_message" xy="88,157" size="1005,193" font="Alimama FangYuanTi VF" fontSize="45" color="#614103" align="center" vAlign="middle" ubb="true" autoSize="none" bold="true" text="空间和空间空间和空间空间和空间&#xA;空间和空间空间和空间空间和空间空间和空间空间和空间空间和空间&#xA;空间和空间空间和空间空间和空间"/>
   </displayList>
 </component>

wb_new_ui/assets/Common/MessageBox1.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="682,406">
+<component size="1182,552">
   <displayList>
-    <component id="n19_xblm" name="btn_close1" src="xblm7jbn" fileName="buttons/btn_bg.xml" xy="-1159,-547" size="3000,1500"/>
+    <component id="n19_xblm" name="btn_close1" src="xblm7jbn" fileName="buttons/btn_bg.xml" xy="-909,-474" size="3000,1500"/>
-    <image id="n17_nuxq" name="bg" src="xblm7jbk" fileName="images/bg.png" xy="0,0" size="682,406">
+    <image id="n17_nuxq" name="bg" src="xblm7jbk" fileName="images/bg.png" xy="0,0" size="1182,552">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <richtext id="n18_xblm" name="tex_message" xy="41,110" size="600,149" font="Alimama FangYuanTi VF" fontSize="36" color="#614103" align="center" vAlign="middle" ubb="true" autoSize="none" text="空间和空间&#xA;空间和空间&#xA;空间和空间"/>
+    <richtext id="n18_xblm" name="tex_message" xy="88,157" size="1005,193" font="Alimama FangYuanTi VF" fontSize="45" color="#614103" align="center" vAlign="middle" ubb="true" autoSize="none" bold="true" text="空间和空间空间和空间空间和空间&#xA;空间和空间空间和空间空间和空间空间和空间空间和空间空间和空间&#xA;空间和空间空间和空间空间和空间"/>
-    <component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="223,272" size="235,92">
+    <component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="436,374" size="309,114">
       <Button title=" " icon="ui://27vd145bxblm7jbl"/>
     </component>
     <component id="n15_f6mj" name="btnCheck" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="-489,272" visible="false">

wb_new_ui/assets/Common/component/dismiss_room/dismiss_room.xml

@@ -13,10 +13,10 @@
       <item/>
       <item/>
     </list>
-    <component id="n7_bt6w" name="btn_aggree" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="859,655" size="386,151" group="n14_bt6w">
+    <component id="n7_bt6w" name="btn_aggree" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="263,655" size="386,151" group="n14_bt6w">
       <Button title=" " icon="ui://27vd145bhy787jce"/>
     </component>
-    <component id="n8_bt6w" name="btn_reject" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="263,655" size="386,151" group="n14_bt6w">
+    <component id="n8_bt6w" name="btn_reject" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="859,655" size="386,151" group="n14_bt6w">
       <Button title=" " icon="ui://27vd145bhy787jcf"/>
     </component>
     <group id="n14_bt6w" name="n14" xy="263,655" size="982,151" advanced="true">

wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_Card_Hu.xml

@@ -8,16 +8,16 @@
   <controller name="mark_ting" pages="0,,1,,2," selected="0"/>
   <controller name="color" pages="0,,1," selected="0"/>
   <controller name="laizi" pages="0,,1," selected="0"/>
-  <controller name="jing" pages="0,,1," selected="0"/>
+  <controller name="jing" pages="0,,1," selected="1"/>
   <displayList>
-    <loader id="n3_hp0b" name="icon" xy="0,0" size="60,84" url="ui://Main_MaJiang/202_101" fill="scaleFree">
+    <loader id="n3_hp0b" name="icon" xy="0,0" size="60,84" url="ui://v0j9abjyk0pa139" fill="scaleFree">
       <gearXY controller="button" pages="0,1" values="0,0|-3,-22" tween="true"/>
       <gearColor controller="quese" pages="1" values="#666666" default="#ffffff"/>
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n12_k1od" name="jing" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="0,0" size="30,30" aspect="true">
+    <image id="n12_k1od" name="jing" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="19,-4" size="39,39" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
-      <gearXY controller="button" pages="0,1" values="0,0|3,-22" tween="true"/>
+      <gearXY controller="button" pages="0,1" values="19,-4|3,-22" tween="true"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_FZCard.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="60,87" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="jing" pages="0,,1," selected="0"/>
+  <controller name="jing" pages="0,,1," selected="1"/>
   <displayList>
     <loader id="n3_nee3" name="icon" xy="0,0" size="60,87" url="ui://v0j9abjyk0pa131" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n4_nee3" name="n4" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="0,0" size="30,31" aspect="true">
+    <image id="n4_nee3" name="n4" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="15,-5" size="43,45" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
       <relation target="" sidePair="width-width,height-height,left-left,top-top"/>
     </image>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml

@@ -5,9 +5,8 @@
     <loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="117,117" skew="180,0" url="ui://Main_Majiang/b202_101" fill="scale">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="4,81" pivot="0.5,0.5" size="58,36" aspect="true" skew="180,0">
+    <image id="n1_gi99" name="n1" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="52,52" pivot="0.5,0.5" size="62,72" skew="180,0">
       <gearDisplay controller="jing" pages="1"/>
-      <relation target="" sidePair="width-width,height-height,left-left,top-top"/>
     </image>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/component/ani/Ani_play_bj.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1,1">
   <displayList>
-    <image id="n0" name="n0" src="gq7m9t" xy="-18,-38"/>
+    <image id="n0" name="n0" src="f8c31ek" fileName="images/img_card_arrow.png" xy="-27,-150" scale="1.5,1.5"/>
   </displayList>
   <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
-    <item time="0" type="XY" target="n0" tween="true" startValue="-18,-38" endValue="-18,-51" duration="12" ease="Linear"/>
+    <item time="0" type="Icon" target="n0" value=""/>
-    <item time="12" type="XY" target="n0" tween="true" startValue="-18,-51" endValue="-18,-38" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n0" tween="true" startValue="-27,-110" endValue="-27,-83" duration="12" ease="Linear"/>
-    <item time="24" type="XY" target="n0" tween="true" startValue="-18,-38" ease="Linear"/>
+    <item time="12" type="XY" target="n0" tween="true" startValue="-27,-83" endValue="-27,-110" duration="12" ease="Linear"/>
+    <item time="24" type="XY" target="n0" value="-27,-110"/>
   </transition>
 </component>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1486,6 +1486,9 @@
     <image id="o4nh1eg" name="126.png" path="/Main_new/Image/"/>
     <image id="o4nh1eh" name="127.png" path="/Main_new/Image/"/>
     <component id="o4nh1ei" name="com_logo.xml" path="/Main_new/Component/"/>
+    <component id="f8c31ej" name="com_hePaiEffect.xml" path="/image/"/>
+    <movieclip id="f8c31a" name="xingxing.jta" path="/"/>
+    <image id="f8c31ek" name="img_card_arrow.png" path="/images/"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/dongxiao/package.xml

@@ -6,7 +6,6 @@
     <movieclip id="j9jp17" name="MovieClip6.jta" path="/"/>
     <movieclip id="j9jp18" name="MovieClip7.jta" path="/"/>
     <movieclip id="j9jp19" name="MovieClip8.jta" path="/"/>
-    <movieclip id="f8c31a" name="xingxing.jta" path="/"/>
   </resources>
   <publish name=""/>
 </packageDescription>

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.7",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "common",
     "check": true,
     "bundle": "base/common",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "login",
     "check": true,
     "bundle": "base/login",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "lobby",
     "check": true,
     "bundle": "base/lobby",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "Family",
     "check": true,
     "bundle": "base/Family",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "rank",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/rank"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "main_majiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/main_majiang"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "main_poker",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/main_poker"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "main_zipai",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/main_zipai"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "static",
     "check": true,
     "bundle": "base/static",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "is_res": true,
     "name": "embed",
     "check": true,
     "bundle": "base/embed",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "main_pokemajiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/main_pokemajiang"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "main_zipaimajiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/main_zipaimajiang"
   }
 ]

wb_unity_pro/ProjectSettings/GraphicsSettings.asset

@@ -38,7 +38,6 @@ 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}