Commit Graph

108 Commits (cd858da64f56c9dd1947583ea567b50459fddae8)

Author SHA1 Message Date
gaoxin 802881378c Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
2021-01-26 11:08:54 +08:00
gaoxin 3b83a72215 【本地化】文字还原 2021-01-26 11:05:27 +08:00
zhangqiang 48f6cef07f 【车迟斗法】车迟斗法抢夺目标排序错误,未按照顺位直接排列 2021-01-21 14:35:05 +08:00
JieLing 1d65116a84 【车迟斗法】冲突解决 2021-01-18 14:23:22 +08:00
DESKTOP-98AVA47\Administrator 8f437f407d 【本周优化修改】 2021-01-15 22:11:38 +08:00
ZhangBiao a064d83bf7 【车迟斗法】boss轮转 2021-01-13 17:59:12 +08:00
gaoxin f501e92272 【本地化】代码还原,合并用 2021-01-12 11:00:44 +08:00
gaoxin 13767fd26e Merge branch 'master_xma_local' into gx/xma_local 2021-01-12 10:56:36 +08:00
gaoxin ae7da93056 【本地化】还原文字 2021-01-12 10:56:26 +08:00
ZhangBiao 37392b2b44 【车迟斗法】boss轮转
(cherry picked from commit ed59466b46)
2021-01-11 19:48:12 +08:00
ZhangBiao 0875314a5d 【车迟斗法】跨期立绘更换
(cherry picked from commit cabce586bf)
2021-01-11 19:46:24 +08:00
ZhangBiao ed59466b46 【车迟斗法】boss轮转 2021-01-11 17:46:34 +08:00
ZhangBiao cabce586bf 【车迟斗法】跨期立绘更换 2021-01-11 17:24:34 +08:00
gaoxin 27b3c1ea32 【本地化】还原文本到代码中合并用 2021-01-09 14:20:06 +08:00
gaoxin 6c1a801779 Merge remote-tracking branch 'origin/gx/test_new' into master_xma_local 2021-01-09 13:54:01 +08:00
ZhangBiao 3dc7618b04 【车迟斗法】boss位置调整3 2021-01-08 19:25:13 +08:00
ZhangBiao bdab3b511d 【车迟斗法】boss位置调整 2021-01-08 19:24:56 +08:00
jiaoyangna b63c18ac53 【ID1007772】
【优化】91, 车迟斗法BOSS每日更换,掉落不同奖励
2021-01-08 19:23:23 +08:00
jiaoyangna dc661f677f 【优化】91, 车迟斗法BOSS每日更换,掉落不同奖励 2021-01-08 19:15:01 +08:00
ZhangBiao f4d437c93b 【车迟斗法】boss位置调整3 2021-01-08 17:41:59 +08:00
ZhangBiao 9a0a80d17c 【车迟斗法】boss位置调整 2021-01-08 17:18:02 +08:00
jiaoyangna 91e003e952 【ID1007772】
【优化】91, 车迟斗法BOSS每日更换,掉落不同奖励
2021-01-07 17:54:55 +08:00
JieLing 03cdc9cf55 Merge branch 'master_xma_test' into gx/test_new
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
2021-01-05 14:23:00 +08:00
zhangqiang c96aedc923 Merge branch 'master_xma_local' into 0功能/本周版本优化内容 2021-01-05 10:33:58 +08:00
jiaoyangna 80229417d4 【优化】91, 车迟斗法BOSS每日更换,掉落不同奖励 2021-01-04 11:42:09 +08:00
gaoxin 9f691e4e05 【优化】scrollview分帧加载-游戏内适应性修改 2020-12-29 20:37:57 +08:00
zhangqiang 35f211a2a4 【工会技能】 优化 连续升级 2020-12-29 16:15:11 +08:00
zhangqiang b0f9e59672 【车迟】抢夺空队伍 提示错误 2020-11-30 11:09:07 +08:00
zhangqiang 6a7c9b920d 【车迟斗法】 修改抢夺 挑战时会报错修复 2020-11-27 17:20:42 +08:00
zhangqiang f8dd59fdfc 【车迟斗法】 我编队为空 或者 对方编队我空 逻辑处理 2020-11-27 17:19:53 +08:00
ZhangBiao 08657b4ffd 【编队优化】车迟 十绝 增加一键 2020-11-18 10:48:35 +08:00
ZhangBiao d7ad797ce5 【车迟斗法】点击抢夺下方名字修改 2020-10-26 18:07:28 +08:00
zhangqiang 7ecb24676f 代码漏提 2020-09-07 14:24:13 +08:00
zhangqiang b6c47a3762 当车迟抢夺编队为空时前端直接弹结果 2020-09-03 15:58:00 +08:00
ZhangBiao 0c3b0e6326 车迟斗法副本界面红点 2020-08-28 16:35:08 +08:00
zhangqiang 162180894b 车迟抢夺记录排续 2020-08-29 15:40:24 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
zhangqiang 72dd128c1f 添加星级天赋描述叠加 去掉无用打印 2020-08-03 16:49:44 +08:00
zhangqiang fc7552f55f 车迟抢夺玩家人物头像属性修改 四元阵修改预设文字 2020-08-19 02:25:01 +08:00
jiaoyangna 180d7122be cardelay update 2020-08-06 14:23:05 +08:00
jiaoyangna b2af34a2b3 副本红点提交 2020-07-29 17:50:15 +08:00
jiaoyangna 28ad4fb613 update kuang 2020-07-28 23:14:02 +08:00
jiaoyangna 48f57d05f1 headframe update 2020-07-28 23:07:26 +08:00
jiaoyangna a37402d40f cardelay update 2020-07-28 22:33:38 +08:00
jiaoyangna 36070bc0c0 cardelaycarbon update 2020-07-28 22:25:51 +08:00
jiaoyangna 38a69a4017 编队添加特效 2020-07-28 16:54:38 +08:00
zhangqiang bedfcdb4f6 车迟怪物显示 2020-09-13 21:56:49 +08:00
jiaoyangna f511cf3380 车迟斗法挑战提交 2020-07-25 19:31:55 +08:00
zhangqiang 264f0b7323 bug 2020-07-17 15:14:15 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00
JieLing cf5f3e9952 内网测试 0.15.12 2020-06-13 11:47:13 +08:00
JieLing 2db43096de 补充提交 2020-06-12 18:04:22 +08:00
JieLing 59db757cf9 六月三号开发提交 2020-06-03 19:09:01 +08:00
JieLing 063868ce73 外网包 0.16.1 2020-05-25 19:16:23 +08:00
JieLing 266b9065d8 测试版本 带热更 0.15.1 2020-05-15 16:52:35 +08:00
JieLing 00892194b5 提交 2020-05-11 09:38:52 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00