Commit Graph

5441 Commits (4aa65ff804bcd4b0301571ae3fd22f8da0111567)
 

Author SHA1 Message Date
zhangqiang 894a8bcfd4 【问题提交】 2021-04-07 19:52:25 +08:00
ZhangBiao 31d0a4ea93 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-07 17:48:15 +08:00
ZhangBiao 83f173bc74 【天枢密卷】提交 2021-04-07 17:48:07 +08:00
jiaoyangna f49bb447fc Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-07 17:47:00 +08:00
jiaoyangna 8696940dda 逍遥提交 2021-04-07 17:46:56 +08:00
ZhangBiao 027de719b6 【福星高照、限时神装】 2021-04-07 17:20:23 +08:00
ZhangBiao 21b97b3985 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-07 16:59:56 +08:00
ZhangBiao 6117dd2363 【牛气冲天】翻译修改 2021-04-07 16:59:47 +08:00
zhangqiang 69d3f4a331 【bug 主要是翻译】 2021-04-07 16:38:26 +08:00
jiaoyangna 6794c272c0 逍遥游提交 2021-04-07 16:30:20 +08:00
jiaoyangna 40351af4da Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-07 16:12:32 +08:00
jiaoyangna 17bc3ce580 逍遥boss 提交 2021-04-07 16:12:29 +08:00
ZhangBiao 5ef984d782 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-07 15:22:43 +08:00
ZhangBiao 33c598e2d9 【天数密卷】按钮文字旋转 2021-04-07 15:22:32 +08:00
jiaoyangna 0c10418a3c 图片提交 2021-04-07 14:23:44 +08:00
ZhangBiao bfaa5195b5 Revert "【表删除】报错处理"
This reverts commit b163fc3035.
2021-04-07 11:54:39 +08:00
zhangqiang b05c9a8c1c 【bug】 十绝阵翻译修改引用 2021-04-07 11:43:25 +08:00
ZhangBiao c9f0efe3f6 【无尽森罗】无法进入修改 2021-04-07 11:35:48 +08:00
jiaoyangna 586d7eca06 限时召唤提交 2021-04-07 11:24:49 +08:00
ZhangBiao c121c077a8 meta提交 2021-04-07 11:23:03 +08:00
ZhangBiao 704dd1ffa5 【化虚坛】未翻译 2021-04-07 11:20:58 +08:00
jiaoyangna 034a8290e5 天书秘卷预设修改 2021-04-07 11:12:14 +08:00
jiaoyangna e5699cb8c7 天书秘卷 图片提交 2021-04-07 11:11:44 +08:00
ZhangBiao 58d20c0bd3 【限时活动】没东西有红点 2021-04-07 11:05:26 +08:00
jiaoyangna 2a0589b1d8 天书秘卷修改提交 2021-04-07 10:58:37 +08:00
zhangqiang 132e4c1260 【bug】奖励排行拉不到底部 2021-04-07 10:30:47 +08:00
gaoxin 9033d47109 【本地化】文本导出 2021-04-06 22:33:57 +08:00
gaoxin d6319948f2 【金钱显示兼容】添加金钱显示组件,对积天豪礼,成长礼包,首充界面进行兼容性处理。 2021-04-06 22:30:21 +08:00
jiaoyangna f6f48149b1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 17:42:05 +08:00
jiaoyangna 04721fe715 【ID1008672】
【逍遥游优化】解锁上方的地图后,进入选择界面默认滚动至相应的入口位置
2021-04-06 17:42:02 +08:00
ZhangBiao 0387c7cf33 【森罗幻境】根据英雄战力排序 2021-04-06 17:26:59 +08:00
jiaoyangna eac03c7d20 车迟斗法提交 2021-04-06 17:02:25 +08:00
jiaoyangna 0df3ee5ea8 车迟斗法描述修改 2021-04-06 16:50:51 +08:00
jiaoyangna 53d8603044 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 16:44:07 +08:00
jiaoyangna db80db31c2 升星神将显示名字修改 2021-04-06 16:44:04 +08:00
ZhangBiao 1647e05beb 【森罗小游戏】文字位置修改 2021-04-06 16:32:52 +08:00
ZhangBiao 7a59fe9d6a 【十五日登陆】增加红点
(cherry picked from commit 120106c6d0d8957d7e7f0bbce687fafd42a70277)
2021-04-06 16:20:36 +08:00
jiaoyangna 6641fa8814 车迟斗法倒计时 2021-04-06 16:16:52 +08:00
jiaoyangna 0d581ebb97 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 16:14:34 +08:00
ZhangBiao 63bcee6168 Merge branch '0活动开发聚集地/十五日登录' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-04-06 15:51:24 +08:00
gaoxin d90b9145b8 Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b 2021-04-06 15:24:46 +08:00
gaoxin cf5a2a46fa 【本地化】还原文本到代码种 2021-04-06 15:23:27 +08:00
gaoxin fc28c2c0a3 Merge branch 'china/dev' into gx/china/dev_tr 2021-04-06 15:21:49 +08:00
gaoxin 08c5c7b423 【本地化】导出文本 2021-04-06 15:21:38 +08:00
jiaoyangna bf4a9ffaa5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 15:20:17 +08:00
jiaoyangna 6e68ac5949 【ID1008671】
【升星优化】升星选择祭品神将时,增加显示内容
2021-04-06 15:20:00 +08:00
gaoxin b163fc3035 【表删除】报错处理 2021-04-06 15:16:37 +08:00
zhangqiang 0b85a85e18 【大闹天宫】 间隔阶段重登提示有问题 2021-04-06 15:11:29 +08:00
jiaoyangna 75feb507d1 【ID1008659】
【图鉴优化】图鉴添加排序规则,按照神将由强至弱进行排序
2021-04-06 14:51:26 +08:00
jiaoyangna 9115df155b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 14:43:48 +08:00