Merge branch 'hy_dny' of ssh://192.168.0.8:29418/xianjing into hy_dny_rgres

Assets/Editor/CsvToLua/CsvToLua.cs

@@ -764,6 +764,7 @@ return aaa";
             while (true)
             {
                 EditorUtility.DisplayProgressBar("复制中", $"复制{curindex}/{len}", curindex/len);
+                curindex++;
                 LuaTable cfg = GetNextCfg_fun.Invoke<LuaTable, LuaTable>(luaTable);
                 //{result = false,path = path,outputPath = outputPath}
                 bool result = cfg.RawGet<string, bool>("result");

Assets/Editor/CsvToLua/luaCopyFileCfg.lua

@@ -227,8 +227,8 @@ luaCopyFileCfg.FileCfg ={
 {basepath = "Assets/Content/Icons/",     path = "Buff",    fileName = "text_buff_shield_up_cn.psd.meta",																		 },
 {basepath = "Assets/Content/Icons/",     path = "Buff",    fileName = "text_buff_speed_down_cn.png",																			 },
 {basepath = "Assets/Content/Icons/",     path = "Buff",    fileName = "text_buff_speed_up_cn.png",																			 },
-{basepath = "Assets/Content/Icons/",     path = "Commonf",    fileName = "ic_res_daijinquan.png",																				 },
-{basepath = "Assets/Content/Icons/",     path = "Commonf",    fileName = "ic_res_newyear_coin.png",																			 },
+{basepath = "Assets/Content/Icons/",     path = "Common",    fileName = "ic_res_daijinquan.png",																				 },
+{basepath = "Assets/Content/Icons/",     path = "Common",    fileName = "ic_res_newyear_coin.png",																			 },
 {basepath = "Assets/Content/Icons/",     path = "ContinuousLogin",    fileName = "label_vip_01.png",																			 },
 {basepath = "Assets/Content/Icons/",     path = "ContinuousLogin",    fileName = "label_vip_01.psd",																	 },
 {basepath = "Assets/Content/Icons/",     path = "ContinuousLogin",    fileName = "label_vip_01.psd.meta",																		 },

Assets/Lua/UI/Common/ChatTextItemCtr.lua

@@ -262,13 +262,13 @@ function ChatTextItemCtr:SetData(wnd, item, logicData, enterType, onClickOwner,
                 item.text.symbolText.raycastTarget = not content.used
                 if not content.used then
                     item.text.symbolTextEvent:RegisterClickEvent(nil, function (hyperParam)
-                        local curTime = ManagerContainer.LuaTimerMgr:GetTimeSecond()
-                        local isOneDay = ManagerContainer.LuaTimerMgr:TwoTimeSecondBetweenOneDay(content.sendTime, curTime)
-                        if not isOneDay then
-                            ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("ExpeditionBailout")
-                            content.used = true
-                            return
-                        end
+                        -- local curTime = ManagerContainer.LuaTimerMgr:GetTimeSecond()
+                        -- local isOneDay = ManagerContainer.LuaTimerMgr:TwoTimeSecondBetweenOneDay(content.sendTime, curTime)
+                        -- if not isOneDay then
+                        --     ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("ExpeditionBailout")
+                        --     content.used = true
+                        --     return
+                        -- end
 
                         local list = string.split(hyperParam, ";")
                         local uid = ManagerContainer.DataMgr.UserData:GetUserId()

Assets/Lua/UI/Common/PrivateChatItemCtr.lua

@@ -110,13 +110,13 @@ function PrivateChatItem:SetData(wnd, item, logicData)
             chatItem.helpText1.symbolText.raycastTarget = not chat.message.used
             if not chat.message.used then
                 chatItem.helpText1.symbolTextEvent:RegisterClickEvent(nil, function (hyperParam)
-                    local curTime = ManagerContainer.LuaTimerMgr:GetTimeSecond()
-                    local isOneDay = ManagerContainer.LuaTimerMgr:TwoTimeSecondBetweenOneDay(chat.message.sendTime, curTime)
-                    if not isOneDay then
-                        ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("ExpeditionBailout")
-                        chat.message.used = true
-                        return
-                    end
+                    -- local curTime = ManagerContainer.LuaTimerMgr:GetTimeSecond()
+                    -- local isOneDay = ManagerContainer.LuaTimerMgr:TwoTimeSecondBetweenOneDay(chat.message.sendTime, curTime)
+                    -- if not isOneDay then
+                    --     ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("ExpeditionBailout")
+                    --     chat.message.used = true
+                    --     return
+                    -- end
 
                     local list = string.split(hyperParam, ";")
                     local uid = ManagerContainer.DataMgr.UserData:GetUserId()

Build/BuildDependenceResource/PackConfig.json

@@ -1048,6 +1048,114 @@
             "keystorePass": "n9P5j2b7blMm",
             "keyaliasName": "game",
             "keyaliasPass": "KlYX666Ro"
+        },
+        {
+            "channelName": "小龙",
+            "appName": "萌新冒險家",
+            "distributeName": "正式服（新港澳台）",
+            "channelUniqueId": "12003020",
+            "bundleId": "com.mxmxjgame.gp",
+            "gameVersionCode": {
+                "major": 1,
+                "minor": 0,
+                "release": 0,
+                "patch": 6
+            },
+            "resVersionCode": {
+                "major": 0,
+                "minor": 1,
+                "release": 0,
+                "patch": 0
+            },
+            "iconRelativePath": "XinLiWuYu",
+            "defineSymbols": [
+                "USE_LUA",
+                "VUPLEX_CCU",
+                "FPS_DISABLE"
+            ],
+            "logo1RelativePath": "xlwy.png",
+            "loginRelativePath": "Default",
+            "gameAssetsPath": "Default",
+            "specialFuncShield": false,
+            "splashScreenRelativeFiles": [],
+            "obscureKey": "b497cf7b1214c130e0140910a7f8c6bf,536607",
+            "obscureOffsetMin": 0,
+            "obscureOffsetValues": [
+                6,
+                12,
+                18
+            ],
+            "sdkVerifyUrl": "http://128.14.226.105:81//",
+            "serverListUrl": "http://128.14.226.105:81/serverlist",
+            "notifyUrl": "http://128.14.226.105:88/res/NoticeNew/",
+            "specialInfoUrl": "http://128.14.226.105:81//channel",
+            "customerServiceInfoUrl": "http://165.154.202.27:81//vipService",
+            "leBian_MainChId": "69423",
+            "leBian_ClientChId": "youyi_bt_jj",
+            "leBian_SECID": "dmcve6kq.c",
+            "plugins": [
+                "common",
+                "YOUYI_1.6.9"
+            ],
+            "sdkBridges": [
+                "Quick_andriod_hy_en"
+            ],
+            "keystoreName": "wenting.keystore",
+            "keystorePass": "n9P5j2b7blMm",
+            "keyaliasName": "game",
+            "keyaliasPass": "KlYX666Ro"
+        },
+        {
+            "channelName": "小龙",
+            "appName": "萌新冒險家",
+            "distributeName": "测试服（新港澳台）",
+            "channelUniqueId": "12003021",
+            "bundleId": "com.mxmxjgame.gp",
+            "gameVersionCode": {
+                "major": 1,
+                "minor": 0,
+                "release": 0,
+                "patch": 6
+            },
+            "resVersionCode": {
+                "major": 0,
+                "minor": 1,
+                "release": 0,
+                "patch": 0
+            },
+            "iconRelativePath": "XinLiWuYu",
+            "defineSymbols": [
+                "USE_LUA",
+                "VUPLEX_CCU",
+                "FPS_DISABLE"
+            ],
+            "logo1RelativePath": "xlwy.png",
+            "loginRelativePath": "Default",
+            "gameAssetsPath": "Default",
+            "specialFuncShield": false,
+            "splashScreenRelativeFiles": [],
+            "obscureKey": "",
+            "obscureOffsetMin": 0,
+            "obscureOffsetValues": [],
+            "sdkVerifyUrl": "http://43.226.57.217:81//",
+            "serverListUrl": "http://43.226.57.217:81/serverlist",
+            "notifyUrl": "http://43.226.57.217:88/res/NoticeNew/",
+            "specialInfoUrl": "http://43.226.57.217:81//channel",
+            "customerServiceInfoUrl": "http://43.226.57.217:81//vipService",
+            "leBian_MainChId": "69423",
+            "leBian_ClientChId": "youyi_bt_jj",
+            "leBian_SECID": "dmcve6kq.c",
+            "plugins": [
+                "common",
+                "YOUYI_1.6.9"
+            ],
+            "sdkBridges": [
+                "Quick_andriod_hy_en"
+            ],
+            "keystoreName": "wenting.keystore",
+            "keystorePass": "n9P5j2b7blMm",
+            "keyaliasName": "game",
+            "keyaliasPass": "KlYX666Ro"
         }
     ],
     "weiDuanAndroids": [

Build/BuildDependenceResource/Plugins/SDKBridge/Android_en_hx/YouYiSDKAndroid.cs

@@ -74,7 +74,16 @@ namespace quicksdk
             {
                 Dictionary<string, SDKMgr.ProductInfo> cfgs = SDKMgr.Instance.ProductInfos;
 
-                string pice = amount.ToString("F2");
+                 int itemp = Mathf.FloorToInt(amount);
+                string pice = "";
+                if ((itemp + 0.005f) > amount)
+                {
+                    pice = itemp.ToString();
+                }
+                else
+                {
+                    pice = amount.ToString("F2");
+                }
 
                 if (cfgs.ContainsKey(pice))
                 {

Build/BuildDependenceResource/Plugins/SDKBridge/Quick_andriod_hy_en/YouYiSDKAndroid.cs

@@ -74,7 +74,16 @@ public class YouYiSDKAndroid : SDKBase
             {
                 Dictionary<string, SDKMgr.ProductInfo> cfgs = SDKMgr.Instance.ProductInfos;
 
-                string pice = amount.ToString("F2");
+                 int itemp = Mathf.FloorToInt(amount);
+                string pice = "";
+                if ((itemp + 0.005f) > amount)
+                {
+                    pice = itemp.ToString();
+                }
+                else
+                {
+                    pice = amount.ToString("F2");
+                }
 
                 if (cfgs.ContainsKey(pice))
                 {