719

lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua

@@ -414,6 +414,8 @@ function M:FillFagData()
                 
                 local vsend = string.gsub(r_item:GetChild("cb_min_send").title, "分", "")
                 tem.UpperLimitReward = ad2d(tonumber(vsend))
+
+                tem.UpperLimitRewardsub = r_item:GetController("give_owner_sub").selectedIndex
             else
                 local v = string.gsub(r_item:GetChild("cb_max").title, "分", "")
                 -- self.hpData.UpperLimit = ad2d(tonumber(v))
@@ -613,6 +615,7 @@ function M:OnRenderItem(index, obj)
     local cb_min_send = obj:GetChild("cb_min_send")
     local UpperLimit = d2ad(data.UpperLimit)
     local UpperLimitReward = d2ad(data.UpperLimitReward or 0)
+    local UpperLimitRewardsub = d2ad(data.UpperLimitRewardsub or 0)
     if tonumber(cb_method.value) == 1 then
         cb_min.title = UpperLimit .. "分" or "0分"
         cb_min_send.title = UpperLimitReward .. "分" or "0分"
@@ -621,6 +624,12 @@ function M:OnRenderItem(index, obj)
         else
             obj:GetController("give_owner").selectedIndex = 1
         end
+
+        if UpperLimitRewardsub == 0 then
+            obj:GetController("give_owner_sub").selectedIndex = 0
+        else
+            obj:GetController("give_owner_sub").selectedIndex = 1
+        end
     else
         cb_max.value = UpperLimit .. "分"
         self:SetIndex(cb_max, d2ad(data.UpperLimit))
@@ -632,6 +641,12 @@ function M:OnRenderItem(index, obj)
             self:UpdateRewards()
         end
     end)
+    obj:GetController("give_owner_sub").onChanged:Add(function()
+       -- if obj:GetController("give_owner_sub").selectedIndex == 0 then
+            data.UpperLimitRewardsub = obj:GetController("give_owner_sub").selectedIndex
+            self:UpdateRewards()
+       -- end
+    end)
 
     if cb_max.selectedIndex == -1 then
         cb_max.selectedIndex = 0
@@ -654,7 +669,12 @@ function M:OnRenderItem(index, obj)
         end
         local tem1 = ""
         if UpperLimitReward ~= 0 then
-            tem1 = string.format(",每个玩家赠送盟主%s分", UpperLimitReward)
+            if UpperLimitRewardsub~=0 then
+                tem1 = string.format(",赢家赠送盟主%s分", UpperLimitReward)
+            else
+                tem1 = string.format(",每个玩家赠送盟主%s分", UpperLimitReward)
+            end
+            
         end
         str_min_tip = string.format("(低于%s分不抽水%s)", UpperLimit, tem1)
         -- str_max_tip = string.format("(低于%s按此设置抽水)", UpperLimit)

wb_new_ui/.objs/workspace.json

@@ -1,8 +1,55 @@
 {
-  "doc.openedDocs": [],
-  "libview.iconScale": 0,
-  "libview.currentGroup": "",
-  "libview.expandedNodes": [],
   "libview.firstColumnWidth": 297,
-  "libview.twoColumn": false
+  "libview.iconScale": 0,
+  "doc.openedDocs": [
+    "ui://m7iejg46hsbhhjn",
+    "ui://m7iejg46c0or7i7d",
+    "ui://m7iejg46nwgkhx2",
+    "ui://m7iejg46nwgkhx0",
+    "ui://m7iejg46ozazhxs",
+    "ui://m7iejg46cioehos",
+    "ui://m7iejg468h207i99",
+    "ui://m7iejg46kwdo7i97",
+    "ui://m7iejg46cvc87i5y",
+    "ui://m7iejg46nk4vhwh",
+    "ui://m7iejg4610snh5j",
+    "ui://m7iejg46kwi0hk0",
+    "ui://m7iejg46qlxihsm",
+    "ui://m7iejg46kwi0hk1",
+    "ui://m7iejg46kwi0hkb",
+    "ui://m7iejg46ilon7ias",
+    "ui://m7iejg46i5987i75",
+    "ui://m7iejg46ilon7i9k",
+    "ui://m7iejg46ilon7ia2",
+    "ui://m7iejg46kwi0hkr",
+    "ui://m7iejg46z3847i6m",
+    "ui://m7iejg46kk3uhrk",
+    "ui://m7iejg46kk3uhrm",
+    "ui://m7iejg46tqi8hwa",
+    "ui://m7iejg46jr1l7i3c",
+    "ui://m7iejg46ilon7ibl",
+    "ui://m7iejg46k5m97i76",
+    "ui://m7iejg46taski05",
+    "ui://m7iejg46i9oq7i3m",
+    "ui://m7iejg46w111hhx",
+    "ui://m7iejg46avqi7ijp",
+    "ui://m7iejg46kk3uhrs",
+    "ui://m7iejg46irlqhyt"
+  ],
+  "auxline1": true,
+  "canvasColor": 10066329,
+  "auxline2": true,
+  "doc.activeDoc": "ui://m7iejg46z3847i6m",
+  "libview.twoColumn": false,
+  "libview.expandedNodes": [
+    "m7iejg46",
+    "/",
+    "m7iejg46",
+    "/mgr/"
+  ],
+  "snapToGrid": true,
+  "backgroundColor": 6710886,
+  "libview.currentGroup": "",
+  "gridSize": 30,
+  "gridColor": 80
 }

wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml

@@ -24,7 +24,7 @@
     <text id="n83_t1hq" name="n83" xy="22,16" size="166,42" group="n88_t1hq" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="shrink" bold="true" text="玩家昵称">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n91_task" name="n91" xy="231,17" size="166,42" group="n88_t1hq" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="none" bold="true" text="总场次">
+    <text id="n91_task" name="n91" xy="231,17" size="166,42" group="n88_t1hq" visible="false" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" autoSize="none" bold="true" text="总场次">
       <relation target="" sidePair="center-center%"/>
     </text>
     <text id="n85_t1hq" name="n85" xy="371,17" size="164,42" group="n88_t1hq" visible="false" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" autoSize="none" bold="true" text="上级">

wb_new_ui/assets/NewGroup/mgr/component/play_set/item_rewards.xml

@@ -6,7 +6,8 @@
   </controller>
   <controller name="last" pages="0,,1," selected="0"/>
   <controller name="first" pages="0,,1," selected="0"/>
-  <controller name="give_owner" pages="0,,1," selected="0"/>
+  <controller name="give_owner" pages="0,,1," selected="1"/>
+  <controller name="give_owner_sub" pages="0,,1," selected="0"/>
   <displayList>
     <component id="n96_kwi0" name="cb_method" src="mkdvhdu" fileName="component/Btn/ComboBox1.xml" xy="4,-1" size="199,49" touchable="false" controller="type,0">
       <gearLook controller="type" pages="0,2,3" values="1,0,0,0|1,0,0,0|1,0,0,0" default="1,0,0,1"/>
@@ -125,19 +126,19 @@
         <item title="1000分" value="1000"/>
       </ComboBox>
     </component>
-    <text id="n103_kwi0" name="tex_min_tip" xy="604,50" size="261,86" group="n110_vz9l" font="Microsoft YaHei" fontSize="20" color="#367256" align="center" vAlign="middle" autoSize="shrink" text="(低于%s分不抽水)&#xA;">
+    <text id="n103_kwi0" name="tex_min_tip" xy="638,46" size="261,86" group="n110_vz9l" font="Microsoft YaHei" fontSize="20" color="#367256" align="center" vAlign="middle" autoSize="shrink" text="(低于%s分不抽水)&#xA;">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="center-center%"/>
     </text>
-    <component id="n123_10xl7" name="btn_input2" src="kwi0hkg" fileName="mgr/component/game/btn_mng_edit.xml" xy="195,62" size="124,58" group="n110_vz9l">
+    <component id="n123_10xl7" name="btn_input2" src="kwi0hkg" fileName="mgr/component/game/btn_mng_edit.xml" xy="85,63" size="124,58" group="n110_vz9l">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="center-center%"/>
     </component>
-    <component id="n116_tdzb" name="btn_give_owner" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" pkg="27vd145b" xy="314,64" size="90,47" group="n110_vz9l">
+    <component id="n116_tdzb" name="btn_give_owner" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" pkg="27vd145b" xy="363,62" size="90,47" group="n110_vz9l">
       <relation target="" sidePair="center-center%"/>
-      <Button title=" " controller="give_owner" page="1"/>
+      <Button checked="true" title=" " controller="give_owner" page="1"/>
     </component>
-    <component id="n117_tdzb" name="cb_min_send" src="mkdvhdu" fileName="component/Btn/ComboBox1.xml" xy="364,62" size="165,49" group="n110_vz9l" touchable="false" controller="type,1">
+    <component id="n117_tdzb" name="cb_min_send" src="mkdvhdu" fileName="component/Btn/ComboBox1.xml" xy="421,60" size="165,49" group="n110_vz9l" controller="type,1">
       <gearLook controller="give_owner" pages="0" values="1,0,0,0" default="1,0,0,1"/>
       <relation target="" sidePair="center-center%"/>
       <ComboBox visibleItemCount="5">
@@ -168,11 +169,15 @@
         <item title="1000分" value="1000"/>
       </ComboBox>
     </component>
-    <component id="n118_tdzb" name="btn_input2_send" src="kwi0hkg" fileName="mgr/component/game/btn_mng_edit.xml" xy="496,61" size="124,58" group="n110_vz9l" touchable="false" grayed="true">
+    <component id="n118_tdzb" name="btn_input2_send" src="kwi0hkg" fileName="mgr/component/game/btn_mng_edit.xml" xy="528,61" size="124,58" group="n110_vz9l">
       <gearLook controller="give_owner" pages="0" values="1,0,1,0" default="1,0,0,1"/>
       <relation target="" sidePair="center-center%"/>
     </component>
-    <group id="n110_vz9l" name="n110" xy="-3,50" size="868,86" group="n109_g21o" advanced="true">
+    <component id="n125_jivj" name="btn_sub_give" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" pkg="27vd145b" xy="207,62" size="90,47" group="n110_vz9l">
+      <relation target="" sidePair="center-center%"/>
+      <Button checked="true" title=" " controller="give_owner_sub" page="1"/>
+    </component>
+    <group id="n110_vz9l" name="n110" xy="-3,46" size="902,86" group="n109_g21o" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
     <component id="n100_kwi0" name="cb_max" src="mkdvhdu" fileName="component/Btn/ComboBox1.xml" xy="438,71" size="193,49" group="n111_vz9l" controller="type,1">
@@ -198,6 +203,6 @@
     <group id="n111_vz9l" name="n111" xy="438,71" size="365,49" group="n109_g21o" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
     </group>
-    <group id="n109_g21o" name="n109" xy="-3,50" size="868,86" advanced="true"/>
+    <group id="n109_g21o" name="n109" xy="-3,46" size="902,86" advanced="true"/>
   </displayList>
 </component>