JieLing
|
52a2ecabd6
|
【活动开启】提审服关闭日周月礼包
|
2021-04-12 10:46:32 +08:00 |
JLIOSM1
|
e99b368abb
|
【adjust】修复打点错误
|
2021-04-11 04:21:55 +08:00 |
JieLing
|
e8dd8f9bea
|
【活动】未开启的活动页签不再显示
|
2021-04-11 02:14:55 +08:00 |
wangzhenxing
|
450e2b412b
|
[战斗]==================同步最新被动逻辑
|
2021-04-10 21:58:27 +08:00 |
JieLing
|
169253497d
|
Merge branch 'xma/dev' into master_xma_local
|
2021-04-10 19:42:42 +08:00 |
gaoxin
|
798eedde7b
|
【adjust】包名修改
|
2021-04-10 19:22:13 +08:00 |
JLIOSM1
|
47a6118d81
|
【adjust】添加创建角色事件
|
2021-04-10 19:17:41 +08:00 |
JieLing
|
8836fac87b
|
Merge branch 'xma/dev' into master_xma_local
|
2021-04-10 18:51:39 +08:00 |
ZhangBiao
|
1981cc1836
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-10 17:58:04 +08:00 |
ZhangBiao
|
cc34d28e8d
|
【公会红包】报错修改
|
2021-04-10 17:57:49 +08:00 |
JieLing
|
ea7282bbbb
|
Merge branch 'xma/dev' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-04-10 17:23:38 +08:00 |
zhangqiang
|
f3a3c34e7c
|
【邮件】协议超问题 修改 2
|
2021-04-10 16:19:33 +08:00 |
zhangqiang
|
8ab2496c28
|
【邮件】增加协议 点击邮件再获取内容
|
2021-04-10 15:37:10 +08:00 |
ZhangBiao
|
385e107b75
|
【boss来袭】越南语BOSS展示显示中文修复
|
2021-04-10 13:30:32 +08:00 |
gaoxin
|
d620d4ff5e
|
【金钱显示】修复每日豪礼销毁再打开报错,更换MoneyNumView字体文件加载方式
|
2021-04-10 11:07:47 +08:00 |
zhangqiang
|
26e998ee59
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 21:54:01 +08:00 |
zhangqiang
|
d73a1adcfb
|
【登录】修复海外登录服无法登录的问题
|
2021-04-09 21:53:47 +08:00 |
ZhangBiao
|
0b2c480b1d
|
【神将进阶】选择进阶神将名字无翻译
|
2021-04-09 21:21:48 +08:00 |
ZhangBiao
|
0f3c59a017
|
【图鉴皮肤】暂时关闭图鉴中皮肤
|
2021-04-09 21:12:56 +08:00 |
ZhangBiao
|
671ba829ca
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 20:31:55 +08:00 |
ZhangBiao
|
da0d4f49d6
|
【装备详情】界面调整
|
2021-04-09 20:31:45 +08:00 |
zhangqiang
|
ccbc758738
|
【未获得装备属性展示】
|
2021-04-09 20:22:25 +08:00 |
ZhangBiao
|
8cd52f0f83
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 19:40:06 +08:00 |
gaoxin
|
53cc2ff930
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 19:39:54 +08:00 |
ZhangBiao
|
8becd11f4d
|
【神衣天降】按钮价格修改
|
2021-04-09 19:39:50 +08:00 |
gaoxin
|
ea06cd97e6
|
【本地化】部分界面文字错误修复
|
2021-04-09 19:39:48 +08:00 |
ZhangBiao
|
831d48f0ef
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 19:09:09 +08:00 |
ZhangBiao
|
e83e9ae889
|
【魂印】购买确认界面的魂印图标错误,没有添加圆形遮罩
|
2021-04-09 19:08:59 +08:00 |
gaoxin
|
0cc7de1597
|
【本地化工具】添加不导出文件配置,gm界面不再导出翻译
|
2021-04-09 18:02:32 +08:00 |
gaoxin
|
26fda17758
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 17:38:24 +08:00 |
gaoxin
|
ea5648839c
|
【配置文件】添加对游戏语音,健康提示显示的配置
|
2021-04-09 17:38:18 +08:00 |
ZhangBiao
|
a53f876a2f
|
【青龙秘宝】文字跳帧
|
2021-04-09 17:13:03 +08:00 |
jiaoyangna
|
c82b907b54
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 16:20:30 +08:00 |
jiaoyangna
|
acca43f54c
|
菩提树神图片提交
|
2021-04-09 16:20:26 +08:00 |
gaoxin
|
196dfa34dd
|
【GM】添加红点数据查看工具
|
2021-04-09 16:14:24 +08:00 |
ZhangBiao
|
a2065c13f2
|
【社稷大典】领取贡献等级奖励,界面会重复播放打开时的动画
|
2021-04-09 15:58:20 +08:00 |
jiaoyangna
|
66763117a3
|
立绘修改提交
|
2021-04-09 15:22:27 +08:00 |
ZhangBiao
|
5de102eb06
|
【天枢密卷】灯笼文字超框修改
|
2021-04-09 14:48:01 +08:00 |
ZhangBiao
|
cb89c89435
|
【限时神装】更改价格单位
|
2021-04-09 14:13:39 +08:00 |
jiaoyangna
|
071a91773a
|
导出 文本提交
|
2021-04-09 12:26:35 +08:00 |
jiaoyangna
|
8291a48e73
|
Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
# Assets/ManagedResources/Icon/ChengHao.meta
# Assets/ManagedResources/Icon/ZuoQi.meta
# Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
# Assets/ManagedResources/~Lua/View/FetterItem.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-04-09 12:24:01 +08:00 |
jiaoyangna
|
0ab7c3177a
|
还原文字提交
|
2021-04-09 12:06:17 +08:00 |
jiaoyangna
|
38e64fb774
|
还原文字提交
|
2021-04-09 11:39:09 +08:00 |
jiaoyangna
|
6db7d3ac5c
|
车迟斗法开启提示修改
|
2021-04-09 11:11:25 +08:00 |
ZhangBiao
|
ca5257e28d
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 11:07:14 +08:00 |
ZhangBiao
|
8893dd7d7b
|
【活动优化】日周月礼包增加角标及妖晶数量变更
|
2021-04-09 11:05:08 +08:00 |
zhangqiang
|
3bd507747e
|
【车迟斗法】车迟斗法倒计时不是在战斗结束开始计算
|
2021-04-09 10:57:31 +08:00 |
ZhangBiao
|
115b2ee04d
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 09:18:03 +08:00 |
wangzhenxing
|
af967ecf93
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 21:10:41 +08:00 |
wangzhenxing
|
d19f1cce1c
|
[战斗]=====被动214,238修改 bug:1014491 1013881
|
2021-04-08 21:09:29 +08:00 |