jiaoyangna
|
37b7071ccf
|
【ID1009590】
【神将信息】增加神将获取途径来源预览功能
|
2021-06-29 20:05:15 +08:00 |
jiaoyangna
|
60b2cf1cf6
|
Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
|
2021-06-18 18:27:01 +08:00 |
jiaoyangna
|
e562176180
|
超凡入圣提交
|
2021-06-18 18:24:04 +08:00 |
ZhangBiao
|
a277f4578c
|
【升星有礼】重构提交
|
2021-06-18 17:00:52 +08:00 |
jiaoyangna
|
10c86e509a
|
超凡入圣修改提交
|
2021-06-18 10:50:04 +08:00 |
ZhangBiao
|
656c8b3359
|
【惊喜礼盒】提交
|
2021-06-16 11:59:52 +08:00 |
gaoxin
|
b3fca866e8
|
Revert "【山河试炼】开坑"
This reverts commit 4df5b08d1f .
|
2021-06-16 10:09:15 +08:00 |
ZhangBiao
|
4df5b08d1f
|
【山河试炼】开坑
|
2021-06-15 11:40:47 +08:00 |
gaoxin
|
39bb3d5c06
|
【称号】修改称号节点为通用节点
|
2021-06-01 21:13:03 +08:00 |
ZhangBiao
|
c98aa8c703
|
【修行】增加属性提升提示
|
2021-06-01 13:54:21 +08:00 |
wangzhenxing
|
574d95b607
|
[限时祈愿活动]======修改bug提交
|
2021-05-29 15:35:52 +08:00 |
wangzhenxing
|
510b2460ea
|
[限时祈愿] 活动奖励界面提交
|
2021-05-28 15:09:18 +08:00 |
wangzhenxing
|
675ef2efd7
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Conflicts:
Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-28 10:47:07 +08:00 |
wangzhenxing
|
21574bebf1
|
【限时祈愿】==祈愿活动提交
|
2021-05-28 10:36:55 +08:00 |
jiaoyangna
|
c95211428b
|
Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-05-26 11:55:14 +08:00 |
zhangqiang
|
a1c4a6aa5c
|
【心魔】 + 山河社稷图修改
|
2021-05-25 14:51:26 +08:00 |
jiaoyangna
|
c22e26a5f5
|
Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
# Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
|
2021-05-24 13:53:28 +08:00 |
jiaoyangna
|
4ced80cf6a
|
福星高照,牛气冲天 提交
|
2021-05-24 11:08:16 +08:00 |
jiaoyangna
|
8719603f64
|
牛气冲天,福星高照修改
|
2021-05-22 15:20:51 +08:00 |
jiaoyangna
|
30a6a41fe6
|
无尽副本修改提交
|
2021-05-21 16:39:08 +08:00 |
ZhangBiao
|
3bb85fd5db
|
【修行】新增通用恭喜界面
|
2021-05-19 16:56:49 +08:00 |
ZhangBiao
|
bcf845ae38
|
【修行】玩家信息界面怎加技能详情
|
2021-05-18 16:13:26 +08:00 |
zhangqiang
|
e763e54799
|
Merge branch 'china/dev-c' into china_fightLevel
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-05-17 11:04:01 +08:00 |
ZhangBiao
|
410262cee8
|
Merge branch 'china/dev' into 0功能/修行玩法
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-14 13:27:01 +08:00 |
zhangqiang
|
da33b98dfb
|
【山河社稷图】提交
|
2021-05-13 09:56:11 +08:00 |
ZhangBiao
|
d5799c1030
|
【修行】神印界面提交
|
2021-05-12 18:24:50 +08:00 |
jiaoyangna
|
06fb7e218f
|
主题活动提交
(cherry picked from commit 847adfc761 )
|
2021-05-12 17:39:46 +08:00 |
jiaoyangna
|
3c04e8dbe1
|
[主题活动修改提交]
(cherry picked from commit f88ccd8f68 )
|
2021-05-12 17:37:59 +08:00 |
ZhangBiao
|
7ba5209394
|
【修行】提交
|
2021-05-11 17:23:19 +08:00 |
zhangqiang
|
effe90990f
|
【山河社稷图】提交
|
2021-05-11 15:12:37 +08:00 |
ZhangBiao
|
7104d77d7e
|
【修行】开坑
|
2021-05-11 15:09:25 +08:00 |
jiaoyangna
|
847adfc761
|
主题活动提交
|
2021-05-10 20:20:20 +08:00 |
jiaoyangna
|
f88ccd8f68
|
[主题活动修改提交]
|
2021-05-10 10:06:53 +08:00 |
gaoxin
|
5254edb78f
|
【UI配置】多余删除还原
|
2021-04-27 14:42:13 +08:00 |
gaoxin
|
357a27c100
|
Merge remote-tracking branch 'origin/剧情' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta
# Assets/ManagedResources/Atlas/Story/wzs.jpg.meta
# Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta
# Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-04-26 19:03:05 +08:00 |
jiaoyangna
|
15ef116032
|
剧情提交
|
2021-04-26 09:41:41 +08:00 |
ZhangBiao
|
bd236f0f32
|
【踏碎凌霄】
|
2021-04-23 14:12:24 +08:00 |
jiaoyangna
|
a0ecd56968
|
剧情提交
|
2021-04-22 15:06:47 +08:00 |
ZhangBiao
|
eab420381c
|
Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-04-21 15:02:04 +08:00 |
ZhangBiao
|
aa834ad136
|
【限时活动】重构完成
|
2021-04-21 15:00:20 +08:00 |
ZhangBiao
|
5043002676
|
【限时活动】限时兑换
|
2021-04-20 21:15:38 +08:00 |
ZhangBiao
|
a7bd34cdad
|
【限时活动】结构调整
|
2021-04-20 20:32:36 +08:00 |
jiaoyangna
|
61833b8b00
|
Merge branch '0功能/挂机界面' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2021-04-20 17:51:14 +08:00 |
ZhangBiao
|
2051a59d74
|
【达人活动】结构调整
|
2021-04-20 16:43:16 +08:00 |
ZhangBiao
|
e08a50f30c
|
【云游商人】
|
2021-04-17 14:01:12 +08:00 |
ZhangBiao
|
98237651c9
|
Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
|
2021-04-16 16:22:13 +08:00 |
ZhangBiao
|
78e320eb26
|
【云游商人】
|
2021-04-16 16:21:34 +08:00 |
ZhangBiao
|
762aef88e0
|
【云游商人】提交
|
2021-04-16 14:58:40 +08:00 |
ZhangBiao
|
6064633a28
|
【云游商人】资源提交
|
2021-04-16 11:12:17 +08:00 |
jiaoyangna
|
5f29447434
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-15 20:37:00 +08:00 |