jiaoyangna
|
21b85bedff
|
【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移 调整间距
(cherry picked from commit eae0af74e5 )
|
2021-07-09 14:47:17 +08:00 |
jiaoyangna
|
2042f3ace8
|
Merge branch '0优化/主题活动' into china/dev
|
2021-07-07 11:57:31 +08:00 |
gaoxin
|
8297176603
|
Merge remote-tracking branch 'origin/china/quick' into china/dev
# Conflicts:
# Assets/Editor/AutoPack.cs
# Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.atlas.txt
# Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.png
# Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
|
2021-07-06 15:37:43 +08:00 |
jiaoyangna
|
8dfb6ac056
|
【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
|
2021-07-06 11:41:01 +08:00 |
jiaoyangna
|
4ba69227f5
|
【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
|
2021-07-06 11:17:49 +08:00 |
jiaoyangna
|
1fedb95da6
|
主题活动 心愿招募 描述修改
|
2021-07-05 11:37:29 +08:00 |
ZhangBiao
|
01a6f7f277
|
【抽卡概率】增加显示概率
|
2021-07-02 14:48:29 +08:00 |
jiaoyangna
|
349404d50e
|
【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
|
2021-06-30 19:28:43 +08:00 |
jiaoyangna
|
3fadc63852
|
商店物品添加特效
|
2021-06-30 18:12:24 +08:00 |
JieLing
|
da2bf20585
|
Merge branch 'china/local' into china/test
|
2021-06-26 19:15:40 +08:00 |
jiaoyangna
|
35523560c0
|
乾坤宝盒 提交
|
2021-06-26 15:28:47 +08:00 |
jiaoyangna
|
0423ac27de
|
乾坤宝盒修改提交
|
2021-06-26 15:28:41 +08:00 |
wangzhenxing
|
129768154c
|
[bug]============【心愿抽卡】道具不足时抽卡,显示特效
|
2021-06-26 14:04:45 +08:00 |
jiaoyangna
|
e7352701e7
|
主题活动修改提交
|
2021-06-23 15:11:32 +08:00 |
JieLing
|
05f9f121d1
|
Merge branch 'china/local' into china/test
|
2021-06-21 14:14:19 +08:00 |
gaoxin
|
3f320f1e89
|
【降妖夺宝】修复协程导致报错
|
2021-06-21 14:12:33 +08:00 |
ZhangBiao
|
428df0c41d
|
【降妖夺宝】限时商市道具光效穿透
|
2021-06-21 10:51:55 +08:00 |
jiaoyangna
|
46efd9b960
|
关闭帮助界面
|
2021-06-19 17:50:23 +08:00 |
jiaoyangna
|
f4fe155533
|
大圣修改
|
2021-06-19 17:47:35 +08:00 |
JieLing
|
b0be50ccb8
|
Merge branch 'china/local' into china/test
|
2021-06-19 17:26:46 +08:00 |
gaoxin
|
6d4d1fc49b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-19 15:28:27 +08:00 |
gaoxin
|
b423005b6e
|
【活动】页签使用原图大小
|
2021-06-19 15:28:22 +08:00 |
ZhangBiao
|
9e5819433e
|
【新将来袭】
|
2021-06-18 18:45:56 +08:00 |
ZhangBiao
|
70a90b0148
|
【新将来袭】在线刷新修改
|
2021-06-18 18:38:17 +08:00 |
ZhangBiao
|
165a724ba3
|
【升星有理】
|
2021-06-18 17:29:00 +08:00 |
ZhangBiao
|
15172dab87
|
【升星有礼】
|
2021-06-18 17:17:52 +08:00 |
ZhangBiao
|
3744d8b901
|
【降妖夺宝】剩余时间限时修改
|
2021-06-18 17:06:20 +08:00 |
ZhangBiao
|
a277f4578c
|
【升星有礼】重构提交
|
2021-06-18 17:00:52 +08:00 |
jiaoyangna
|
e593381b77
|
降妖夺宝修改提交
(cherry picked from commit 106647a69c )
|
2021-06-18 14:48:23 +08:00 |
ZhangBiao
|
6e617123b7
|
【新将来袭降妖夺宝】
|
2021-06-18 14:47:13 +08:00 |
ZhangBiao
|
958f2774e5
|
【新将来袭、降妖夺宝】重构提交
|
2021-06-17 20:31:47 +08:00 |
JieLing
|
91bf6b36af
|
Merge branch 'china/local' into china/test
|
2021-06-15 18:10:18 +08:00 |
zhangqiang
|
9a1f0078df
|
【部分美术效果无法展示】1
|
2021-06-09 15:58:04 +08:00 |
JieLing
|
8614a86275
|
Merge branch 'china/local' into china/test
|
2021-06-08 14:51:19 +08:00 |
jiaoyangna
|
8df928f686
|
【ID1016261】
【灵兽宝阁】灵兽宝阁白泽假战斗结束报错
|
2021-06-08 14:29:58 +08:00 |
jiaoyangna
|
0d5c47f347
|
【ID1016261】
【灵兽宝阁】灵兽宝阁白泽假战斗结束报错
|
2021-06-08 11:40:40 +08:00 |
jiaoyangna
|
24e2646bb8
|
心愿抽卡十连 报错修改
|
2021-06-07 18:06:23 +08:00 |
JieLing
|
197f661868
|
Merge branch 'china/local' into china/test
|
2021-06-07 14:25:23 +08:00 |
ZhangBiao
|
4b708011bc
|
【玩家信息】红点问题修复 和log清楚
|
2021-06-04 16:10:17 +08:00 |
ZhangBiao
|
326b790bcf
|
【抽卡】界面报错修改
|
2021-06-03 19:44:39 +08:00 |
wangzhenxing
|
2cde942f47
|
[限时祈愿]=====红点逻辑修改
|
2021-06-03 12:04:04 +08:00 |
wangzhenxing
|
2de61d062d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 11:29:45 +08:00 |
wangzhenxing
|
ba04ea8e71
|
【心愿抽卡】====修改概率显示,必得剩余次数修改
|
2021-06-02 11:29:26 +08:00 |
ZhangBiao
|
681b3b63bb
|
【每日礼包】特效问题修改
|
2021-06-01 20:02:48 +08:00 |
wangzhenxing
|
aa3171aef7
|
[抽卡祈愿]======活动报错修改
|
2021-06-01 14:41:28 +08:00 |
jiaoyangna
|
1f1d9f6ff2
|
活动页签修改提交
|
2021-06-01 14:12:49 +08:00 |
jiaoyangna
|
d82bbbf579
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 13:54:05 +08:00 |
jiaoyangna
|
a1bc2ae463
|
活动修改提交
|
2021-06-01 13:53:47 +08:00 |
zhangqiang
|
7048691167
|
【心愿抽卡】十连没音效
|
2021-06-01 13:42:36 +08:00 |
jiaoyangna
|
ad004ddc5e
|
限时召唤修改提交
|
2021-06-01 11:46:00 +08:00 |