ZhangBiao
|
8c90b7fe7c
|
【自选宝箱】
|
2021-03-18 10:11:00 +08:00 |
gaoxin
|
778ed8e886
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-18 10:07:08 +08:00 |
gaoxin
|
64ee4697f5
|
【bug】点击替换装备,装备图标跟穿戴着的图标一样
|
2021-03-18 10:07:03 +08:00 |
jiaoyangna
|
98e2ad0e3b
|
【美元显示】解锁青龙秘宝
|
2021-03-18 09:56:02 +08:00 |
jiaoyangna
|
4715c7d469
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 20:43:50 +08:00 |
jiaoyangna
|
9f1f204588
|
主界面提交
|
2021-03-17 20:43:47 +08:00 |
ZhangBiao
|
84788732a2
|
首充金额修改
|
2021-03-17 19:06:15 +08:00 |
ZhangBiao
|
1688bd41fb
|
【八日登录】图片位置修改
|
2021-03-17 18:01:58 +08:00 |
JieLing
|
ca3bcb612d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 17:37:06 +08:00 |
JieLing
|
40c0ed6075
|
【sdk】国内sdk适应修改
|
2021-03-17 17:36:50 +08:00 |
jiaoyangna
|
f35e638e22
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 17:34:20 +08:00 |
jiaoyangna
|
d6b008742b
|
gm 提交
|
2021-03-17 17:34:14 +08:00 |
gaoxin
|
7b28309e1c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 17:30:18 +08:00 |
gaoxin
|
40bfa7c586
|
【配置】国内相关修改
|
2021-03-17 17:30:13 +08:00 |
zhangqiang
|
f2b3df9721
|
【修改提交】
|
2021-03-17 17:27:53 +08:00 |
zhangqiang
|
6eb9050d4a
|
【轩辕宝镜】不进版本但是可以通过穿戴界面道具跳转
|
2021-03-17 17:17:20 +08:00 |
zhangqiang
|
d5f34e516c
|
【巅峰赛】巅峰赛中的机器人详情页有加好友和加黑名单、切磋等按钮,没有屏蔽掉
|
2021-03-17 16:56:02 +08:00 |
gaoxin
|
8cf2670d6b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:54:02 +08:00 |
gaoxin
|
80209e4a35
|
【引导战斗】加入
|
2021-03-17 16:53:48 +08:00 |
wangzhenxing
|
7185fb678f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:46:02 +08:00 |
wangzhenxing
|
433a6b243c
|
[战斗]=============被动191修改,buff图标叠加添加免疫和连接符
|
2021-03-17 16:45:26 +08:00 |
gaoxin
|
2db591318f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:45:19 +08:00 |
gaoxin
|
6f52e3e338
|
【bug】统一一键合成时的文字提示
|
2021-03-17 16:45:13 +08:00 |
wangzhenxing
|
7d576d8c0c
|
[战斗]=============被动225修改 增加最大血量客户端特殊处理
|
2021-03-17 16:43:28 +08:00 |
jiaoyangna
|
adb3a1e750
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:20:22 +08:00 |
ZhangBiao
|
2e685100ea
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:17:50 +08:00 |
ZhangBiao
|
c8661ab384
|
【首领来袭】任务过小修改,
|
2021-03-17 16:17:41 +08:00 |
zhangqiang
|
38a6548a52
|
【充值】开服成长礼包道具太多,会重叠。
|
2021-03-17 16:15:55 +08:00 |
jiaoyangna
|
5963eb170b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:04:31 +08:00 |
ZhangBiao
|
b630889891
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:01:02 +08:00 |
ZhangBiao
|
17990d0dc8
|
【自选宝箱】修改
|
2021-03-17 16:00:52 +08:00 |
zhangqiang
|
125a393167
|
【修bug】
|
2021-03-17 15:54:45 +08:00 |
gaoxin
|
aa30b1ed6e
|
【bug】修复升级神将立即关闭界面,再次打开界面时显示错误
|
2021-03-17 15:29:23 +08:00 |
jiaoyangna
|
95351b5bd1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 15:03:54 +08:00 |
zhangqiang
|
7cc397c43f
|
【资源替换】技能新字替换
|
2021-03-17 14:58:54 +08:00 |
ZhangBiao
|
4efb36a195
|
【八日登陆】资源修改
|
2021-03-17 14:37:56 +08:00 |
jiaoyangna
|
ee30858c07
|
添加一个红点
|
2021-03-17 14:20:51 +08:00 |
jiaoyangna
|
909ed03c04
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 13:33:22 +08:00 |
ZhangBiao
|
bf3d732b69
|
【中文本地化】
|
2021-03-17 12:05:44 +08:00 |
jiaoyangna
|
32c239fcb2
|
活动开启条件提交
|
2021-03-17 12:02:32 +08:00 |
jiaoyangna
|
31b808209e
|
主界面修改提交
|
2021-03-17 11:55:02 +08:00 |
jiaoyangna
|
dfd3c4acc6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 11:54:40 +08:00 |
ZhangBiao
|
15dec90220
|
【本地化】修改
|
2021-03-17 11:29:43 +08:00 |
jiaoyangna
|
a7c5bcce1a
|
主界面修改提交
|
2021-03-17 11:07:47 +08:00 |
jiaoyangna
|
5d89fe2a79
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 10:38:11 +08:00 |
jiaoyangna
|
36f4efedc8
|
主城优化修改
|
2021-03-17 10:38:07 +08:00 |
gaoxin
|
15103f5032
|
【ios】引导战斗添加
|
2021-03-17 09:52:50 +08:00 |
gaoxin
|
232e7c158a
|
【优化】优化lateUpdate,修复使用lateupdate报错时会使所有lateupdate失效的问题
|
2021-03-17 09:52:17 +08:00 |
gaoxin
|
ef7130e056
|
修改首充界面错误
|
2021-03-16 18:29:25 +08:00 |
gaoxin
|
c8c81215ce
|
【图鉴】根据表配置控制显示隐藏
|
2021-03-16 18:06:57 +08:00 |
jiaoyangna
|
3fe1267e86
|
功能隐藏
(cherry picked from commit 2f2cf25801)
|
2021-03-16 17:43:59 +08:00 |
jiaoyangna
|
8ec9b44626
|
功能不进版本隐藏按钮
(cherry picked from commit 0b538b6e1e)
|
2021-03-16 17:38:29 +08:00 |
ZhangBiao
|
e758730d4a
|
【首领来袭】
|
2021-03-16 17:25:11 +08:00 |
ZhangBiao
|
003d2e8ba5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-16 17:09:35 +08:00 |
ZhangBiao
|
c2cab749f4
|
【首领来袭】位置调整
|
2021-03-16 17:09:18 +08:00 |
JieLing
|
c945f53946
|
【修改bug】提交 竞技场 + 试炼奖励优化list重叠
|
2021-03-16 16:06:55 +08:00 |
ZhangBiao
|
6dda93f175
|
【国内测试】无法登录修复
|
2021-03-16 15:29:38 +08:00 |
ZhangBiao
|
4528e23541
|
Merge branch 'china/dev' into 0活动开发聚集地/限时神装
|
2021-03-16 14:49:47 +08:00 |
jiaoyangna
|
27859eec4f
|
灵兽羁绊修改提交
|
2021-03-16 11:10:09 +08:00 |
JieLing
|
7215433a87
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-16 10:30:37 +08:00 |
JieLing
|
ab8d5b8a2d
|
【国内先遣修改】
|
2021-03-16 10:25:41 +08:00 |
ZhangBiao
|
d82eb7f88a
|
【战斗开始过快修复】
|
2021-03-15 20:35:16 +08:00 |
ZhangBiao
|
95080d3da7
|
|
2021-03-15 18:38:26 +08:00 |
ZhangBiao
|
49701bcbec
|
【首领来袭】战斗报错修复
|
2021-03-15 18:37:16 +08:00 |
ZhangBiao
|
1b06ae40c9
|
【battlelogic】增加log
|
2021-03-15 17:11:52 +08:00 |
ZhangBiao
|
86fdb9395b
|
Merge branch '0功能/本周版本优化内容' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
|
2021-03-15 10:51:17 +08:00 |
ZhangBiao
|
9be337324a
|
【限时神装】完成
|
2021-03-15 10:37:26 +08:00 |
jiaoyangna
|
4e4dedec14
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-13 17:38:02 +08:00 |
jiaoyangna
|
f48ee539f6
|
修改提交
|
2021-03-13 17:37:59 +08:00 |
ZhangBiao
|
17a9550df8
|
【首领来袭】
|
2021-03-13 15:52:50 +08:00 |
ZhangBiao
|
37e948c9b9
|
【限时神装】
|
2021-03-13 15:09:34 +08:00 |
jiaoyangna
|
b63d62c7f1
|
文字修改提交
|
2021-03-13 14:25:25 +08:00 |
jiaoyangna
|
b260a2d0d8
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-13 14:22:54 +08:00 |
jiaoyangna
|
c7860fec99
|
文字修改提交
|
2021-03-13 14:22:48 +08:00 |
ZhangBiao
|
a9d26fb31e
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-13 14:01:04 +08:00 |
ZhangBiao
|
e9cadb6cb9
|
重登确认框
|
2021-03-13 14:00:27 +08:00 |
jiaoyangna
|
ea095efbfd
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-13 13:57:50 +08:00 |
jiaoyangna
|
8eec6650f2
|
图片提交
|
2021-03-13 13:57:42 +08:00 |
zhangqiang
|
27af55f25a
|
【待导入资源】导入
|
2021-03-13 13:09:38 +08:00 |
ZhangBiao
|
0779a816e0
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-13 12:57:41 +08:00 |
ZhangBiao
|
5334a7c7da
|
【首领来袭】
|
2021-03-13 12:57:31 +08:00 |
jiaoyangna
|
8656408ac9
|
宝箱状态修改
|
2021-03-12 18:18:25 +08:00 |
jiaoyangna
|
388f68d39d
|
鸿蒙提示修改
|
2021-03-12 17:28:10 +08:00 |
jiaoyangna
|
446d9c85ea
|
添加妖晶不足提示
|
2021-03-12 17:24:24 +08:00 |
jiaoyangna
|
5ed4d34201
|
合并修改提交
|
2021-03-12 17:08:51 +08:00 |
jiaoyangna
|
aa94edf1d7
|
Merge branch 'xma/dev' into 0功能/本周版本优化内容
|
2021-03-12 16:41:18 +08:00 |
jiaoyangna
|
579f2806c3
|
竞技守卫名字修改提交
(cherry picked from commit d3efa809d8)
|
2021-03-12 16:35:55 +08:00 |
jiaoyangna
|
fa64d90f08
|
社稷大点领取奖励后宝箱状态修改
(cherry picked from commit 7fe83b0cea)
|
2021-03-12 15:55:57 +08:00 |
jiaoyangna
|
5be52f6b33
|
限时活动提交
(cherry picked from commit e3460c8b83)
|
2021-03-12 15:48:29 +08:00 |
ZhangBiao
|
4f326e59e5
|
【本地化】战力排名弹窗,弹窗中无玩家排名,排名未刷新
|
2021-03-12 15:10:55 +08:00 |
ZhangBiao
|
51c0b51a87
|
【本地化】魂灵宝处需要修改
|
2021-03-12 15:07:17 +08:00 |
jiaoyangna
|
7b5cc295e8
|
文字提交
|
2021-03-12 14:32:45 +08:00 |
ZhangBiao
|
8aad1eee56
|
【限时神装】
|
2021-03-12 14:31:53 +08:00 |
jiaoyangna
|
838de7cd1c
|
文字提交
|
2021-03-12 14:31:52 +08:00 |
jiaoyangna
|
dd706075d2
|
Merge branch 'xma/dev' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
# Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
|
2021-03-12 14:30:10 +08:00 |
jiaoyangna
|
8430af12af
|
文字提交
|
2021-03-12 14:24:41 +08:00 |
jiaoyangna
|
1cd3d4cdaa
|
文字提交
|
2021-03-12 14:20:14 +08:00 |
jiaoyangna
|
decb1e6ff0
|
图片提交
|
2021-03-12 14:13:42 +08:00 |
jiaoyangna
|
2a6a2e69da
|
图片提交,巅峰赛竞技守卫名字提交
|
2021-03-12 12:08:24 +08:00 |
jiaoyangna
|
5acc67ead5
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-12 11:11:25 +08:00 |
jiaoyangna
|
a018c485c0
|
哪吒修改提交
|
2021-03-12 11:11:14 +08:00 |
wangzhenxing
|
491a6f311a
|
[战斗]========= buff 叠层表现修改
|
2021-03-12 11:04:06 +08:00 |
jiaoyangna
|
04ab1e5451
|
社稷大典奖励领取提交
|
2021-03-12 10:32:32 +08:00 |
zhangqiang
|
6fcd6778cc
|
【资源替换】
|
2021-03-12 10:28:56 +08:00 |
zhangqiang
|
8a1bd7da8d
|
【资源提交】s_cyh_0008_slide
|
2021-03-11 16:22:14 +08:00 |
ZhangBiao
|
24ea537bba
|
Merge branch 'master_xma_local' into 0活动开发聚集地/限时神装
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
|
2021-03-11 15:15:09 +08:00 |
ZhangBiao
|
b926310982
|
【大闹天宫】死亡神将可以一键上阵,并且进入战斗页直接显示(败)
|
2021-03-11 15:05:38 +08:00 |
ZhangBiao
|
9b30532bda
|
【图鉴】十星神将图鉴等级显示错误
|
2021-03-11 14:32:08 +08:00 |
ZhangBiao
|
1e2dc32804
|
【列表打开动画】森罗幻境选择神将界面,每选中一个头像都会播一遍动画
|
2021-03-11 14:28:44 +08:00 |
jiaoyangna
|
292069ba5d
|
活动提交
|
2021-03-11 10:59:49 +08:00 |
ZhangBiao
|
4631f663a8
|
【本地化】魂灵宝处需要修改
|
2021-03-11 10:41:34 +08:00 |
ZhangBiao
|
fbe4e36c95
|
【鸿蒙阵】加速冷却,妖精不足时提示不足,领取妖精后依然提示不足,重登正常
|
2021-03-11 10:21:48 +08:00 |
zhangqiang
|
53e0bc02a1
|
【资源导入】0001头像立绘
|
2021-03-11 09:40:12 +08:00 |
ZhangBiao
|
867dcf5007
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-10 18:35:38 +08:00 |
ZhangBiao
|
884abb765d
|
【车迟斗法】修改
|
2021-03-10 18:35:14 +08:00 |
zhangqiang
|
a0e14a4126
|
【卡牌资源】提交
|
2021-03-10 18:20:37 +08:00 |
gaoxin
|
2e6cfc3232
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-10 18:11:32 +08:00 |
gaoxin
|
17a9108b01
|
【网络】修复断开连接接口参数错误
|
2021-03-10 18:11:27 +08:00 |
ZhangBiao
|
4a3b79fce7
|
【锻器阁】添加材料图标不对称
|
2021-03-10 17:57:19 +08:00 |
zhangqiang
|
d8e37cdc66
|
【大闹天宫前端合并修改提交】
|
2021-03-10 17:44:56 +08:00 |
zhangqiang
|
88d1464fb3
|
【大闹天宫前端修改提交】
|
2021-03-10 17:42:17 +08:00 |
zhangqiang
|
0ba3ebb44d
|
【大闹天宫修改】前端圣物战力 商店节点加妖晶显示
|
2021-03-10 17:33:13 +08:00 |
ZhangBiao
|
4fe58e9145
|
【鸿蒙阵】删了空行 bug没复现
|
2021-03-10 17:29:31 +08:00 |
gaoxin
|
06f54f15b3
|
【配置】兼容老包
|
2021-03-10 14:56:53 +08:00 |
jiaoyangna
|
b92d4f01e2
|
wrap 提交
|
2021-03-10 14:16:02 +08:00 |
jiaoyangna
|
4121f24a27
|
Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
|
2021-03-10 13:50:38 +08:00 |
gaoxin
|
ee6fde0370
|
【策划场景】修改战斗中立绘的配置方式
|
2021-03-10 11:53:07 +08:00 |
gaoxin
|
3daf6a11b3
|
【本地化】青龙秘宝活动时间显示优化
|
2021-03-10 11:19:20 +08:00 |
gaoxin
|
e3bc4ecfe0
|
【本地化】修复升级重复显示lv文字
|
2021-03-10 11:04:46 +08:00 |
wangzhenxing
|
ca62c6f377
|
Merge branch '0功能/本周版本优化内容_battle' into 0功能/本周版本优化内容
|
2021-03-10 10:30:47 +08:00 |
gaoxin
|
e725a887a9
|
【bug】修复公告界面显示错误
|
2021-03-09 18:31:19 +08:00 |
ZhangBiao
|
03de42eb51
|
【首领来袭】判断关卡类型
|
2021-03-09 17:19:00 +08:00 |
wangzhenxing
|
1b64251cbd
|
Merge branch '0功能/本周版本优化内容' into 0功能/本周版本优化内容_battle
|
2021-03-09 17:13:33 +08:00 |
JieLing
|
f0a85ff774
|
【hotfix】打包配置提交
|
2021-03-09 16:05:33 +08:00 |
JieLing
|
abd4028923
|
【meta】打包后meta文件上传
|
2021-03-09 16:04:18 +08:00 |
wangzhenxing
|
a2b96970cc
|
【战斗】=========打闹天宫获取英雄模板数据修改,改为全从 heroconfig 表获取
|
2021-03-09 15:48:28 +08:00 |
gaoxin
|
9aa87b54e2
|
【本地化】资源替换
|
2021-03-09 15:44:44 +08:00 |
gaoxin
|
460479779e
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-09 15:39:46 +08:00 |
gaoxin
|
13fbabf125
|
【bug】修复老包中文字重叠
|
2021-03-09 15:39:42 +08:00 |
ZhangBiao
|
cdc8d468cb
|
【灵兽界面】文字问题
|
2021-03-09 15:34:29 +08:00 |
gaoxin
|
d2940b5a18
|
【bug】修复排行榜分页 数据刷新后会导致页面回到最上方
|
2021-03-09 15:18:27 +08:00 |
gaoxin
|
141e60d493
|
【本地化】修复灵兽装备按钮默认显示英文的问题
|
2021-03-09 15:00:59 +08:00 |
jiaoyangna
|
5bd35da17c
|
Revert "图片整理提交"
This reverts commit 988b881285.
|
2021-03-09 14:37:14 +08:00 |
jiaoyangna
|
0b5afbc4ea
|
Revert "删除 有_zh的图片的 没有加后缀的 图片"
This reverts commit 72998061d8.
|
2021-03-09 14:36:27 +08:00 |
jiaoyangna
|
64062ba3cf
|
Revert "图片提交"
This reverts commit 6418f1280d.
|
2021-03-09 14:36:20 +08:00 |
jiaoyangna
|
6418f1280d
|
图片提交
|
2021-03-09 14:18:15 +08:00 |
jiaoyangna
|
72998061d8
|
删除 有_zh的图片的 没有加后缀的 图片
|
2021-03-09 14:08:19 +08:00 |
jiaoyangna
|
988b881285
|
图片整理提交
|
2021-03-09 12:44:53 +08:00 |
jiaoyangna
|
d2d0f04d58
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-09 12:13:24 +08:00 |
jiaoyangna
|
bdba95c160
|
添加整理资源
|
2021-03-09 12:03:53 +08:00 |
JieLing
|
5eef06e043
|
【bug】修复老包报错
|
2021-03-08 22:33:04 +08:00 |
JieLing
|
4cac839360
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-08 22:17:15 +08:00 |
JieLing
|
5d149e54fa
|
【bug】修复老包报错
|
2021-03-08 22:17:00 +08:00 |
ZhangBiao
|
ce7a9abe08
|
【大闹天宫】招募节点回滚
|
2021-03-08 20:40:55 +08:00 |
gaoxin
|
88c5fa7a02
|
【本地化】老包设置界面删除多余显示
|
2021-03-08 18:20:47 +08:00 |
wangzhenxing
|
b67d6485c9
|
[战斗]==============249修改
|
2021-03-08 18:07:13 +08:00 |
gaoxin
|
097d754111
|
【本地化】新增资源
|
2021-03-08 17:27:45 +08:00 |
gaoxin
|
6d7c2c0a25
|
【本地化】图片资源压缩
|
2021-03-08 16:53:16 +08:00 |
gaoxin
|
766ba304ed
|
【本地化】法宝回收提示文本翻译,神将装备界面对比套装属性翻译,轩辕宝镜充值界面文本显示调整
|
2021-03-08 16:51:13 +08:00 |
gaoxin
|
c67d5d4d3f
|
【bug】修复本地化导致其他语言支付不成功
|
2021-03-08 16:19:12 +08:00 |
gaoxin
|
2838044ac5
|
【本地化】鸿蒙阵提示界面显示修改
|
2021-03-08 16:16:27 +08:00 |
gaoxin
|
eca086eabc
|
【工具】特效资源整理工具
|
2021-03-08 14:37:38 +08:00 |
gaoxin
|
30b1091289
|
【工具】刷新资源路径工具不再自动重命名
|
2021-03-08 14:34:02 +08:00 |
gaoxin
|
12ecb9f437
|
【本地化】修复老包找不到Configmgr报错
|
2021-03-08 11:23:00 +08:00 |
ZhangBiao
|
42547ff956
|
【本地化】八日登陆**问题解决
|
2021-03-08 11:06:07 +08:00 |
ZhangBiao
|
da0b2d010a
|
【本地化】签到宝箱下移
|
2021-03-08 11:00:33 +08:00 |
ZhangBiao
|
33d6f64785
|
【本地化】鸿蒙阵结果中文修改
|
2021-03-08 10:57:57 +08:00 |
gaoxin
|
81a10ad759
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 22:35:42 +08:00 |
gaoxin
|
62c03bfebf
|
【本地化】热更新提示框文字超出显示范围
|
2021-03-07 22:35:37 +08:00 |
gaoxin
|
0e62748aff
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 21:22:36 +08:00 |
gaoxin
|
7662a5b154
|
【本地化】灵兽技能文字左移
|
2021-03-07 21:22:23 +08:00 |
gaoxin
|
96086a40a4
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 20:48:17 +08:00 |
gaoxin
|
22dbfc310c
|
【本地化】我要变强推荐阵容显示修改,热更大小保留小数点后两位,十绝阵奖励显示修改
|
2021-03-07 20:48:05 +08:00 |
jiaoyangna
|
f5a1514674
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 20:42:55 +08:00 |
jiaoyangna
|
8431c1eb69
|
商店修改
|
2021-03-07 20:41:33 +08:00 |
gaoxin
|
0a251132e0
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 19:32:10 +08:00 |
gaoxin
|
b82352796e
|
【本地化】鸿蒙阵修复文字重叠
|
2021-03-07 19:14:30 +08:00 |
gaoxin
|
25af0a837a
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 19:06:17 +08:00 |
gaoxin
|
bbca0ca426
|
【本地化】装备切换界面套装属性翻译,成就提示文字超框显示修改
|
2021-03-07 19:06:13 +08:00 |
gaoxin
|
e874afa2ea
|
【本地化】十绝阵结算还是会重叠
|
2021-03-07 18:00:12 +08:00 |
gaoxin
|
76d4d549e8
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:54:51 +08:00 |
gaoxin
|
4e93380a99
|
【本地化】法宝升级界面文字重叠
|
2021-03-07 17:54:46 +08:00 |
jiaoyangna
|
17b6ae35b1
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:52:27 +08:00 |
jiaoyangna
|
c86865b3dd
|
装备提交
|
2021-03-07 17:52:23 +08:00 |
gaoxin
|
89ff803da0
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:43:12 +08:00 |
gaoxin
|
f8dc9552c9
|
【本地化】十绝阵结算伤害文字重叠
|
2021-03-07 17:43:04 +08:00 |
DESKTOP-98AVA47\Administrator
|
270b53cab1
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:36:23 +08:00 |
gaoxin
|
fb8637c613
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:31:43 +08:00 |
gaoxin
|
9156962e89
|
【本地化】限时召唤英雄名称显示不全
|
2021-03-07 17:31:25 +08:00 |
jiaoyangna
|
594ce2b53a
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Message/MissionDailyTipPanel.prefab
|
2021-03-07 17:17:47 +08:00 |
jiaoyangna
|
bba9bf2b37
|
本地化提交
|
2021-03-07 17:17:23 +08:00 |
gaoxin
|
71bd8865fd
|
【本地化】青龙秘宝超框,成就完成提示超框
|
2021-03-07 17:15:33 +08:00 |
jiaoyangna
|
e02c48df84
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:00:55 +08:00 |
jiaoyangna
|
6d985b13e2
|
本地化
|
2021-03-07 17:00:50 +08:00 |
gaoxin
|
52a2b6ca63
|
【本地化】魂印分解界面文字重合修复
|
2021-03-07 17:00:15 +08:00 |
gaoxin
|
7c8cf16c98
|
【bug】修复图鉴界面打开报错
|
2021-03-07 16:43:07 +08:00 |
jiaoyangna
|
d62263859c
|
【本地化】竞技场界面时间修改
|
2021-03-07 16:28:45 +08:00 |
gaoxin
|
ea8c1a9e7d
|
【适配】热更界面屏幕适配修改
|
2021-03-07 16:20:11 +08:00 |
gaoxin
|
3175ef5eb2
|
【适配】鸿蒙阵屏幕适配修改
|
2021-03-07 16:19:53 +08:00 |
gaoxin
|
022444dffa
|
【bug】修复副本界面在全面屏下ui变小的问题
|
2021-03-07 15:46:19 +08:00 |