”同步“

lua_probject/base_project/Game/View/Common/BaseWindow.lua

@@ -12,7 +12,7 @@ BaseWindow = {
     --弹出动画，0关闭，1左边，2右边
     _anim_pop = 0,
     --关闭摧毁
-    _close_destroy = false,
+    _close_destroy = true,
 
     --点击窗口以外关闭
     _close_zone = true,
@@ -68,7 +68,7 @@ function M:init(url)
     --printlog(url)
     self._view = UIPackage.CreateObjectFromURL(url)
     --printlog(self._view)
-     --self._view.fairyBatching = true
+    --self._view.fairyBatching = true
     local btn_close = self._view:GetChild("btn_close")
     if (btn_close) then
         btn_close.onClick:Set(function()

lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua

@@ -219,6 +219,10 @@ function FamilyNumberRecord.New(root, page)
         self._viewlist_numberRecordDetail:RefreshVirtualList()
     end)
     self._view:GetChild('btn_allChooseRead').onClick:Set(function()
+        if self.military.size == 0 then
+            ViewUtil.ShowOneChooose({ showText = "请至少勾选一个牌局" })
+            return
+        end
         local newReadType = 3 - self.readStatusNum
         fgCtr:FG_SetGroupRecordReadStatus(group_id, GetPlatform(), self.military.list, newReadType - 1, self._tagId,
             function(res)
@@ -417,7 +421,7 @@ function M:NumberRecordDetailRender()
             ImageLoad.Load(resultInfo.portrait, obj:GetChild('btn_head')._iconObject)
             obj:GetChild('text_name').text = resultInfo.nick
             obj:GetChild('text_score').text = string.format("%s%s", resultInfo.score >= 0 and "+" or "", resultInfo
-            .score)
+                .score)
             obj:GetController('colour').selectedIndex = resultInfo.score >= 0 and 1 or 0
         end
         resultDetailList.numItems = #info.totalScore

lua_probject/base_project/Game/View/ViewUtil.lua

@@ -73,7 +73,7 @@ local function __ShowTips(msg, time)
     _defaultTooltipWin.touchable = false
     _defaultTooltipWin.text = msg
     GRoot.inst:AddChild(_defaultTooltipWin)
-    _defaultTooltipWin:MakeFullScreen()
+    _defaultTooltipWin:Center()
     _tip_timer = Timer.New(function()
         __waittips()
     end, time, 1, true)

lua_probject/base_project/Game/View/WitnessView.lua

@@ -1,4 +1,3 @@
-local MJSettingView = require("main.majiang.MJSettingViewNew")
 local MJMainView = require("main.majiang.MJMainView")
 
 local WitnessView = {}
@@ -13,9 +12,9 @@ function M:init()
     UIPackage.AddPackage('base/chat/ui/Chat')
 
     self._eventmap = {}
-    self._put_map = false
+    self._scale = true
-    self._new_hide = false
+    self._full_offset = false
-    self._queue = false
+    self.class = "MainView"
     self._style = 1
     self._popEvent = true
     self:InitView()
@@ -25,14 +24,10 @@ function M:InitView(url)
     local room = self._room
     BaseView.InitView(self, url)
 
-    self.btn_setting = self._view:GetChild("btn_setting")
+
 
     self.com_logocType = self._view:GetChild("com_logo"):GetController("cType")
 
-    self.btn_setting.onClick:Set(function()
-        local view = MJSettingView.new(self, true)
-        view:Show()
-    end)
     self.com_notice = self._view:GetChild("com_notice")
 end
 
@@ -69,4 +64,51 @@ function M:DoNoticeAnimation()
     self._room.card_type = 1
 end
 
+function M:OnUpdate()
+    if (self._popEvent) then
+        local func = self._gamectr:PopEvent()
+        if (func ~= nil) then
+            local success, result = pcall(func)
+            if success then
+
+            else
+                print("witness error")
+                print(result)
+                error(result)
+                -- self._gamectr = ControllerManager.GetController(GameController)
+                -- if self._gamectr then
+                --     self._gamectr:ResetConnect()
+                -- end
+            end
+            --func()
+        end
+    end
+end
+
+function M:DestroyPlayerInfo()
+    for i = 1, #self._player_info do
+        self._player_info[i]:Destroy()
+    end
+end
+
+function M:Destroy()
+    TimerManager.Clear()
+    -- self:UnmarkSelfTuoguan()
+    self:DestroyPlayerInfo()
+    DSTweenManager.ClearTween()
+
+    NetResetConnectWindow.CloseNetReset()
+    Voice.CrealRecord()
+    ControllerManager.resetJionRoom = false
+    self._popEvent = false
+    GRoot.inst:HidePopup()
+    ViewUtil.CloseModalWait()
+    GameApplication.Instance.StopMusic = 0
+    coroutine.stopAll()
+    UpdateBeat:Remove(self.OnUpdate, self)
+    BaseView.Destroy(self)
+    BaseWindow.DestroyAll()
+    ResourcesManager.UnLoadGroup('base_chat')
+end
+
 return M

lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua

@@ -780,7 +780,7 @@ function M:OnFangziAction(...)
     -- local pNode = info._mask_liangpai
     local effect = UIPackage.CreateObject("Extend_MJ_LiChuan", "FzEffect")
     if fz.type == FZType.Peng then
-        self:PlaySound("FuZhou_MJ", player.self_user.sex, "peng")
+        self:PlaySound("LiChuan_MJ", player.self_user.sex, "peng")
         effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
         effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
         -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "碰框")

lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua

@@ -278,6 +278,7 @@ function M:EventInit()
     _gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
 
     _gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
+        self._popEvent = false
         self._left_time = 0
         self:UpdateCardBox(0)
         local arg = { ... }
@@ -292,6 +293,7 @@ function M:EventInit()
         local player = self._room:GetPlayerBySeat(win_seat)
         info:ShowHuCard(win_card, index == 1)
 
+
         -- self.cHuCardEffect.selectedIndex = 1
 
         local loader_HuEffect = info._viewLoader_selfHuCardEffect
@@ -434,10 +436,12 @@ function M:EventInit()
         local result = arg[1]
         local over = arg[3]
         self._clearingView = EXClearingView.new()
-        coroutine.start(function()
+        if over ~= 2 or _room.curren_round > 0 then
-            coroutine.wait(0.5)
+            coroutine.start(function()
-            self._clearingView:Show()
+                coroutine.wait(0.5)
-        end)
+                self._clearingView:Show()
+            end)
+        end
         self._clearingView:InitData(over, _room, result, total_result)
         ControllerManager.ChangeController(LoddyController)
     end)
@@ -498,17 +502,54 @@ function M:OnFangziAction(...)
     local info = _player_card_info[self:GetPos(player.seat)]
     -- local pNode = info._mask_liangpai
 
+
+
+    local arg = { ... }
+    local _player_card_info = self._player_card_info
+    local fz = arg[1]
+    local player = arg[2]
+    local index = arg[3]
+    local info = _player_card_info[self:GetPos(player.seat)]
+    -- local pNode = info._mask_liangpai
+    local effect = UIPackage.CreateObject("Extend_MJ_LiChuan", "FzEffect")
+    if fz.type == FZType.Peng then
+        self:PlaySound("LiChuan_MJ", player.self_user.sex, "peng")
+        effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
+        effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
+        -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "碰框")
+    elseif fz.type == FZType.Chi then
+        self:PlaySound("LiChuan_MJ", player.self_user.sex, "chi")
+        effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
+        effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
+    else
+        self:PlaySound("LiChuan_MJ", player.self_user.sex, "gang")
+        effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
+        effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
+        -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "杠框")
+    end
+    effect.touchable = false
+    effect:GetTransition("t2"):Play()
+    -- pNode:AddChild(effect)
+    coroutine.start(function()
+        coroutine.wait(0.3)
+        self._popEvent = true
+    end)
+    coroutine.start(function()
+        coroutine.wait(2)
+        effect:Dispose()
+    end)
+
     self:RemoveCursor()
     if (player.seat ~= fz.from_seat) then
         local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
         fs_info:UpdateOutCardList()
     end
+    local seat = (self._room.room_config.people_num == 2 and fz.from_seat == 2) and 2 or fz.from_seat - 1
+    info:UpdateFzList(fz, index, true, seat)
 
-    info:UpdateFzList(fz, index, true)
+    --因为观战没有手牌，等预处理完扣牌数之后矫正一次(最粗暴的修正方式，手牌数等于13-3*吃碰数)
-    local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi
-    --printlog(getcard)
 
-    info._player.hand_left_count = info._player.hand_left_count - 1
+    info._player.hand_left_count = 14 - 3 * #info._player.fz_list
     info:UpdateHandCardWitness(true)
     -- self:__CloseTip()
 end
@@ -553,27 +594,6 @@ end
 --     end
 -- end
 
-function M:OnUpdate()
-    if (self._popEvent) then
-        local func = self._gamectr:PopEvent()
-        if (func ~= nil) then
-            local success, result = pcall(func)
-            if success then
-
-            else
-                print("witness error")
-                print(result)
-                error(result)
-                -- self._gamectr = ControllerManager.GetController(GameController)
-                -- if self._gamectr then
-                --     self._gamectr:ResetConnect()
-                -- end
-            end
-            --func()
-        end
-    end
-end
-
 function M:ResetConnect()
 
 end

lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua

@@ -297,7 +297,7 @@ function M:UpdateOutCardList(outcard, card_item, cursor)
                 -- GRoot.inst:AddChild(cursor)
                 cursor.xy = self._view_outCardList.xy +
                     self._view_outCardList:GlobalToLocal(outcard:LocalToGlobal(Vector2.New(outcard.width * 0.5,
-                        outcard.height * 0.5)))
+                        outcard.height * 0.4)))
             end, Time.deltaTime, 1, false):Start()
         end
     end

lua_probject/main_project/main/majiang/MJSettingViewNew.lua

@@ -21,7 +21,7 @@ function M:Reflash()
         self.cBtn.selectedIndex = 1
     end
 
-    if DataManager.CurrenRoom.playing then
+    if DataManager.CurrenRoom.playing or DataManager.CurrenRoom.curren_round > 0 then
         self.cBtn.selectedIndex = 1
     end
 
@@ -58,6 +58,7 @@ function MJSettingViewNew.new(blur_view, flag_witness)
     self.onChangeCardCallback = event("onCallback", true)
     self.onChangeLanguageCallback = event("onCallback", true)
     self._mainView = blur_view
+    self._close_destroy = true
     --[[
     self._currenIndex = 0
     self.stateIndex = 0
@@ -143,6 +144,7 @@ function M:init(url)
         if self._flag_witness then
             local _room = DataManager.CurrenRoom
             self._mainView._gamectr:ExitWitnessGame(_room.play_id, _room.game_id, _room.room_id)
+            self:Destroy()
             ViewManager.ChangeView(ViewManager.View_Family)
             return
         end

lua_probject/main_project/main/majiang/MJWitnessView.lua

@@ -1,6 +1,7 @@
 local WitnessView = require("Game.View.WitnessView")
 local TableBG = require("Game.Data.TableBG")
 local HuCardImg = import(".HuCardImg")
+local MJSettingView = require("main.majiang.MJSettingViewNew")
 
 
 
@@ -47,6 +48,12 @@ function M:InitView()
         end)
     end
     TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
+
+    self.btn_setting = self._view:GetChild("btn_setting")
+    self.btn_setting.onClick:Set(function()
+        local view = MJSettingView.new(self, true)
+        view:Show()
+    end)
 end
 
 local majiang_asset_path = "base/main_majiang/sound/"

wb_new_ui/assets/Common/ToolsTip.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,90" extention="Label">
+<component size="149,88" extention="Label">
   <displayList>
-    <graph id="n0" name="n0" xy="0,-85" size="1334,86" group="n2" type="rect" lineSize="0" lineColor="#ffffcc00" fillColor="#80000000">
+    <graph id="n0" name="n0" xy="0,0" size="149,88" group="n2" type="rect" lineSize="0" lineColor="#ffffcc00" fillColor="#80000000">
-      <relation target="" sidePair="width-width"/>
+      <relation target="n1" sidePair="width-width"/>
     </graph>
-    <text id="n1" name="title" xy="10,-75" size="1317,68" group="n2" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="ffffff">
+    <text id="n1" name="title" xy="26,7" size="97,74" group="n2" font="Arial" fontSize="56" color="#ffffff" align="center" vAlign="middle" text="333"/>
-      <relation target="" sidePair="width-width"/>
+    <group id="n2" name="n2" xy="0,0" size="149,88" advanced="true"/>
-    </text>
-    <group id="n2" name="n2" xy="0,-85" size="1334,86" advanced="true"/>
   </displayList>
+  <relation target="n1" sidePair="width-width"/>
   <transition name="t0" autoPlay="true">
     <item time="0" type="XY" target="n2" tween="true" startValue="0,-87" endValue="0,0" duration="6" ease="Quart.Out"/>
     <item time="46" type="XY" target="n2" tween="true" startValue="0,0" endValue="0,-85" duration="14" ease="Quart.In"/>

wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="page" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="page" pages="0,,1,,2,,3," selected="1"/>
   <controller name="day" pages="0,,1," selected="0"/>
   <controller name="sort" pages="0,,1," selected="0"/>
   <controller name="limitDay" pages="0,,1," selected="0"/>
@@ -37,14 +37,16 @@
     <group id="n11_lgoh" name="Top" xy="113,159" size="1509,206" group="n17_lgoh"/>
     <text id="n12_lgoh" name="n12" xy="604,308" size="159,86" group="n16_lgoh" font="ui://27vd145bg2mo7ij0" fontSize="66" color="#444444" align="center" autoSize="none" text="已读"/>
     <text id="n13_lgoh" name="n13" xy="1777,310" size="159,86" group="n16_lgoh" font="ui://27vd145bg2mo7ij0" fontSize="66" color="#444444" align="center" autoSize="none" text="未读"/>
+    <image id="n190_kyrh" name="n190" src="kyrh7d70" fileName="NumberRecord/Image/矩形 1.png" xy="112,402" size="1137,711" group="n16_lgoh"/>
     <component id="n14_lgoh" name="comp_numberRecordByGameTypelooked" src="qz7i7cxi" fileName="NumberRecord/Component/comp_numberRecordByGameType.xml" xy="117,436" size="1127,659" group="n16_lgoh">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
+    <image id="n192_kyrh" name="n192" src="kyrh7d70" fileName="NumberRecord/Image/矩形 1.png" xy="1292,403" size="1137,710" group="n16_lgoh"/>
     <component id="n15_lgoh" name="comp_numberRecordByGameType" src="qz7i7cxi" fileName="NumberRecord/Component/comp_numberRecordByGameType.xml" xy="1298,436" size="1129,659" group="n16_lgoh">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <group id="n16_lgoh" name="Button" xy="117,308" size="2310,787" group="n17_lgoh"/>
+    <group id="n16_lgoh" name="Button" xy="112,308" size="2317,805" group="n17_lgoh"/>
-    <group id="n17_lgoh" name="numberRecord2" xy="113,159" size="2314,936" group="n73_lgoh" advanced="true">
+    <group id="n17_lgoh" name="numberRecord2" xy="112,159" size="2317,954" group="n73_lgoh" advanced="true">
       <gearDisplay controller="page" pages="1"/>
     </group>
     <image id="n18_lgoh" name="n18" src="c8pn7d02" fileName="Main/Image/Rectangle 93(1)(1).png" xy="6,140" size="2520,1011" group="n20_lgoh"/>

wb_new_ui/assets/Family/package.xml

@@ -412,13 +412,13 @@
     <image id="ofwa7d6n" name="hall_club_BG_landifang.png" path="/Main/Image/"/>
     <image id="ofwa7d6o" name="hall_club_BG_landiyuan.png" path="/Main/Image/" scale="9grid" scale9grid="16,16,44,4"/>
     <image id="l9ll7d6r" name="Slice 1.png" path="/ChatRoom/Component/"/>
-    <image id="l9ll7d6t" name="Slice 1.png" path="/NumberRecord/Component/"/>
     <component id="66fw7d6u" name="item_msg(1).xml" path="/FamilyMsgRecord/Component/" exported="true"/>
     <image id="66fw7d6v" name="Group 650(1).png" path="/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="25,22,54,59"/>
     <image id="66fw7d6w" name="Rectangle 290(1).png" path="/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="20,21,40,42"/>
     <image id="66fw7d6x" name="Rectangle 291(1).png" path="/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="21,22,42,44"/>
     <component id="66fw7d6y" name="com_FamilyMsgRecord.xml" path="/FamilyMsgRecord/" exported="true"/>
     <component id="66fw7d6z" name="item_msg_diamond.xml" path="/FamilyMsgRecord/Component/" exported="true"/>
+    <image id="kyrh7d70" name="矩形 1.png" path="/NumberRecord/Image/" scale="9grid" scale9grid="10,10,20,20"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1,1" pivot="0.5,0.5">
   <displayList>
-    <image id="n0" name="n0" src="f8c31ek" fileName="images/img_card_arrow.png" xy="-25,-66" size="51,67" aspect="true"/>
+    <image id="n0" name="n0" src="f8c31ek" fileName="images/img_card_arrow.png" xy="-31,-83" size="63,82" aspect="true"/>
   </displayList>
   <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
     <item time="0" type="Icon" target="n0" value=""/>
-    <item time="0" type="XY" target="n0" tween="true" startValue="-,-108" endValue="-,-81" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n0" tween="true" startValue="-,-123,0,-123" endValue="-,-96,0,-96" duration="12" ease="Linear"/>
-    <item time="12" type="XY" target="n0" tween="true" startValue="-,-81" endValue="-,-108" duration="12" ease="Linear"/>
+    <item time="12" type="XY" target="n0" tween="true" startValue="-,-96,0,-96" endValue="-,-123,0,-123" duration="12" ease="Linear"/>
   </transition>
 </component>

wb_unity_pro/Assets/Plugins/Android/libs/appvest.jar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 281a0e123a1666246830216d8b2a9894
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/arm64-v8a/gdb.setup

@@ -0,0 +1,2 @@
+set solib-search-path D:\GameAll\jx_client\wb_unity_pro\Assets\Plugins\Android\scripts\..\build\obj/local/arm64-v8a
+directory D:/Android/NDK/r21e/android-ndk-r21e/build//../toolchains/llvm/prebuilt/windows-x86_64/sysroot D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++ D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++abi/include D:/GameAll/jx_client/wb_unity_pro/Assets/Plugins/Android/scripts/../jni D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++/include D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++/../llvm-libc++abi/include

wb_unity_pro/Assets/Plugins/Android/libs/arm64-v8a/gdb.setup.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0a33a26ce4da95545bfa44d83d645a95
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/arm64-v8a/gdbserver.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6b5241970a440b540bffd1a3b8718c02
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/arm64-v8a/libc++_shared.so.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3ff7392b00c5f754289bdc86a32dd239
+guid: 8602830fb8763d7429e987e5ad778555
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

wb_unity_pro/Assets/Plugins/Android/libs/arm64-v8a/libnative-lib.so.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 573af538d71a8364890b8cbaa0a776d8
+guid: 8ede9627bf7531143bb12871a20d132d
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

wb_unity_pro/Assets/Plugins/Android/libs/armeabi-v7a/gdb.setup

@@ -0,0 +1,2 @@
+set solib-search-path D:\GameAll\jx_client\wb_unity_pro\Assets\Plugins\Android\scripts\..\build\obj/local/armeabi-v7a
+directory D:/Android/NDK/r21e/android-ndk-r21e/build//../toolchains/llvm/prebuilt/windows-x86_64/sysroot D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/android/support D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++ D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++abi/include D:/GameAll/jx_client/wb_unity_pro/Assets/Plugins/Android/scripts/../jni D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++/include D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++/../llvm-libc++abi/include

wb_unity_pro/Assets/Plugins/Android/libs/armeabi-v7a/gdb.setup.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 95530d94f78ff0942bdb30fa3a340664
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/armeabi-v7a/gdbserver.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 62e77024dda25564aa7747db4ac06701
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/armeabi-v7a/libc++_shared.so.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 95a47b3e52538434abd96211233fdde8
+guid: 43c984b99abd8aa4da224df76dd8924a
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

wb_unity_pro/Assets/Plugins/Android/libs/armeabi-v7a/libnative-lib.so.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d9885a900b8e8074b94dba0f002c5252
+guid: b474d1cb89d61f9409d5127d07ed856a
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

wb_unity_pro/Assets/Plugins/Android/libs/armeabi-v7a/libtolua.so.meta

@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: 4fb9a29f65e536b4293f7f9affd19158
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  platformData:
-    Android:
-      enabled: 1
-      settings:
-        CPU: ARMv7
-    Any:
-      enabled: 0
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-        DefaultValueInitialized: true
-        OS: AnyOS
-    Linux:
-      enabled: 0
-      settings:
-        CPU: x86
-    Linux64:
-      enabled: 0
-      settings:
-        CPU: x86_64
-    OSXIntel:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    OSXIntel64:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    Win:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    Win64:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    iOS:
-      enabled: 0
-      settings:
-        CompileFlags: 
-        FrameworkDependencies: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/buglyagent.jar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: aca0e865482a0784796bbc7687d5321e
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/clinkapi-release.jar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: f411a7611a940bd45b537aebd9974082
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/libammsdk.jar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: fc047e1e7a7e21740848ebf1f71dd212
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/support-v4-19.1.0.jar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 2a94dc3a67eef0e478a5a1f06a86c451
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/x86.meta

@@ -2,4 +2,7 @@ fileFormatVersion: 2
 guid: d76e3311efeac224996b0cb7a06a7a3a
 folderAsset: yes
 DefaultImporter:
+  externalObjects: {}
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/x86/gdb.setup

@@ -0,0 +1,2 @@
+set solib-search-path D:\GameAll\jx_client\wb_unity_pro\Assets\Plugins\Android\scripts\..\build\obj/local/x86
+directory D:/Android/NDK/r21e/android-ndk-r21e/build//../toolchains/llvm/prebuilt/windows-x86_64/sysroot D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/android/support D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++ D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++abi/include D:/GameAll/jx_client/wb_unity_pro/Assets/Plugins/Android/scripts/../jni D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++/include D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++/../llvm-libc++abi/include

wb_unity_pro/Assets/Plugins/Android/libs/x86/gdb.setup.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b0503741e263a834fac834aaa11d03dc
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/x86/gdbserver.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7a5f73e6a4bec974891c9876698cfc95
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/x86/libc++_shared.so.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4bc76aa18782d064d9b645d4970c0458
+guid: ed9503e37618f9b4b99f749aef097f0b
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
@@ -16,7 +16,7 @@ PluginImporter:
     second:
       enabled: 1
       settings:
-        CPU: ARMv7
+        CPU: x86
   - first:
       Any: 
     second:

wb_unity_pro/Assets/Plugins/Android/libs/x86/libnative-lib.so.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c0fdc89dabc68b643bd13d5de599f89d
+guid: a209ca7942b25494b9a84571f398c4e5
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
@@ -16,7 +16,7 @@ PluginImporter:
     second:
       enabled: 1
       settings:
-        CPU: ARM64
+        CPU: x86
   - first:
       Any: 
     second:

wb_unity_pro/Assets/Plugins/Android/libs/x86/libtolua.so.meta

@@ -1,78 +0,0 @@
-fileFormatVersion: 2
-guid: b3f1ad25b4054b34d9105289ee492b57
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      : Linux
-    second:
-      enabled: 0
-      settings:
-        CPU: x86
-  - first:
-      : OSXIntel
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  - first:
-      : OSXIntel64
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings:
-        CPU: x86
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-        DefaultValueInitialized: true
-        OS: AnyOS
-  - first:
-      Standalone: Linux64
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  - first:
-      Standalone: Win
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  - first:
-      Standalone: Win64
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 0
-      settings:
-        CompileFlags: 
-        FrameworkDependencies: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/x86_64.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 80771f38f2d5ee24289bb15ca397a10c
+guid: 8e9d17e0f1eba244ba11f32cf0c678ba
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

wb_unity_pro/Assets/Plugins/Android/libs/x86_64/gdb.setup

@@ -0,0 +1,2 @@
+set solib-search-path D:\GameAll\jx_client\wb_unity_pro\Assets\Plugins\Android\scripts\..\build\obj/local/x86_64
+directory D:/Android/NDK/r21e/android-ndk-r21e/build//../toolchains/llvm/prebuilt/windows-x86_64/sysroot D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++ D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++abi/include D:/GameAll/jx_client/wb_unity_pro/Assets/Plugins/Android/scripts/../jni D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++/include D:/Android/NDK/r21e/android-ndk-r21e/build//../sources/cxx-stl/llvm-libc++/../llvm-libc++abi/include

wb_unity_pro/Assets/Plugins/Android/libs/x86_64/gdb.setup.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 76b56907803c59c4b93d49a3c867a682
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/x86_64/gdbserver.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ab9040b3ff0509040a8155ded717d118
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/Plugins/Android/libs/x86_64/libc++_shared.so.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0fd0a3a223d3c6340a3eb79bbb123c45
+guid: cf9641577bce1834e80d8a87d2d86558
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

wb_unity_pro/Assets/Plugins/Android/libs/x86_64/libnative-lib.so.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1c6c2cf0f672fe34886878c8c502d691
+guid: f1d2ea1ead2db0648956763f6de73f9b
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
@@ -14,7 +14,7 @@ PluginImporter:
   - first:
       Android: Android
     second:
-      enabled: 1
+      enabled: 0
       settings: {}
   - first:
       Any: 

wb_unity_pro/Assets/Scripts/GameApplication.cs

@@ -8,6 +8,8 @@ using UnityEngine.Networking;
 using System.IO;
 using taurus.client;
 using taurus.unity;
+using System.Runtime.InteropServices;
+using System;
 
 public class GameApplication : MonoBehaviour
 {
@@ -255,7 +257,8 @@ public class GameApplication : MonoBehaviour
         }
         if (result != 10) _wxlogin_callback = null;
     }
-    
+    [DllImport("native-lib")]
+    private static extern IntPtr getAppIdCSharp();
     public void WXLogin(LuaFunction callback)
     {
         if (!buildApp) return;

wb_unity_pro/Assets/Scripts/Platform/PlatformAndroid.cs

@@ -22,7 +22,7 @@ public class PlatformAndroid :MonoBehaviour
             //Debug.LogError("初始化安卓==========");
             _player = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
             _activity = _player.GetStatic<AndroidJavaObject>("currentActivity");
-           // Debug.LogError("===============");
+            // Debug.LogError("===============");
         }
     }