ZhangBiao
|
276e0129fe
|
【十五日登陆】修改提交
(cherry picked from commit 8e0177d3ed )
|
2021-04-12 15:06:43 +08:00 |
jiaoyangna
|
034ed82f0f
|
皮肤错误修改
|
2021-04-12 14:02:03 +08:00 |
gaoxin
|
4015e2a616
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 14:14:11 +08:00 |
gaoxin
|
75bd39a6c2
|
【icon】新增宝箱Icon
|
2021-04-09 14:13:56 +08:00 |
ZhangBiao
|
cb89c89435
|
【限时神装】更改价格单位
|
2021-04-09 14:13:39 +08:00 |
jiaoyangna
|
3471fde5d2
|
重复资源提交
|
2021-04-09 13:55:55 +08:00 |
jiaoyangna
|
9496ef8943
|
meta 文件提交
(cherry picked from commit e0fec1aa3a )
|
2021-04-09 13:42:03 +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 |
zhangqiang
|
a3647d7cbe
|
【排行榜】与排行第一切磋后返回,不显示小人形象
|
2021-04-08 21:07:36 +08:00 |
zhangqiang
|
19ba1ffc5a
|
【分解】神将达到上限,分解后,再获得神将依然提示已达上限,重登正常
|
2021-04-08 21:03:47 +08:00 |
jiaoyangna
|
fa4cdf0f2d
|
主城添加判断等级判断
|
2021-04-08 20:55:49 +08:00 |
jiaoyangna
|
e14b9d4343
|
主城修改 提交
|
2021-04-08 20:52:59 +08:00 |
gaoxin
|
075101090d
|
【首充】文字显示调整
|
2021-04-08 20:52:01 +08:00 |
ZhangBiao
|
3edd56034a
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 20:48:31 +08:00 |
ZhangBiao
|
b3aa8ebf2a
|
【神将置换】英雄名过长修改
|
2021-04-08 20:48:17 +08:00 |
gaoxin
|
ba17f4fdc2
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 20:40:05 +08:00 |
gaoxin
|
eab8a42191
|
【灵兽特惠】金钱显示兼容
|
2021-04-08 20:40:00 +08:00 |
zhangqiang
|
393a05ee99
|
【大闹天宫】生死簿神将头像边框颜色与品质不符
|
2021-04-08 20:27:21 +08:00 |
gaoxin
|
4a1a95d9fd
|
【八日登录】修复第四天后的提示白片
|
2021-04-08 20:23:06 +08:00 |
gaoxin
|
f49bb49041
|
【每日豪礼】金钱显示走活动表
|
2021-04-08 20:20:09 +08:00 |
gaoxin
|
effab48074
|
【每日豪礼】金钱数量走表
|
2021-04-08 20:10:25 +08:00 |
gaoxin
|
4a3d61b159
|
【每日豪礼】金钱显示兼容处理
|
2021-04-08 20:07:19 +08:00 |
gaoxin
|
840153d911
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 20:07:03 +08:00 |
gaoxin
|
645fc52869
|
【金钱组件】添加旋转接口
|
2021-04-08 20:06:57 +08:00 |
zhangqiang
|
d1f88d5b33
|
【红点】退出公会,入口依然显示红点
|
2021-04-08 20:03:19 +08:00 |
ZhangBiao
|
56c0462062
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 19:58:51 +08:00 |
ZhangBiao
|
78c1b12067
|
【森罗幻境】小游戏转盘,灵兽碎片显示整只灵兽
|
2021-04-08 19:58:41 +08:00 |
zhangqiang
|
cc6137697a
|
加打印
|
2021-04-08 19:45:04 +08:00 |
gaoxin
|
601e1c0971
|
【本地化】资源文件压缩处理
|
2021-04-08 18:37:17 +08:00 |
gaoxin
|
9de990fafd
|
【本地化】资源名修正
|
2021-04-08 18:29:09 +08:00 |
gaoxin
|
10f502dc14
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 18:16:47 +08:00 |
gaoxin
|
500d54469d
|
【扫光】挂机,充值界面扫光光效添加
|
2021-04-08 18:16:28 +08:00 |
zhangqiang
|
2be3a11fe7
|
【尝试修复邮件红点】
|
2021-04-08 18:15:29 +08:00 |
ZhangBiao
|
4977de55ba
|
【坐骑】界面文字适应修改
|
2021-04-08 18:01:29 +08:00 |
jiaoyangna
|
dde0be7d87
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-08 17:58:20 +08:00 |
jiaoyangna
|
c86307d328
|
图鉴添加皮肤页签
|
2021-04-08 17:58:17 +08:00 |
ZhangBiao
|
f49455e1a8
|
【自选宝箱】文字提示暂无外语版本,改回
(cherry picked from commit 0d3f84f5e1 )
|
2021-04-08 17:50:12 +08:00 |
ZhangBiao
|
2da1f06bcb
|
【自选宝箱】还是修改
(cherry picked from commit 89c8179840 )
|
2021-04-08 17:49:58 +08:00 |
ZhangBiao
|
fdbf4d054b
|
【自选宝箱】
(cherry picked from commit 16db37cf29 )
|
2021-04-08 17:49:52 +08:00 |
ZhangBiao
|
a49fbd2183
|
【自选宝箱】文字提示
(cherry picked from commit cb5c940e25 )
|
2021-04-08 17:49:44 +08:00 |