jiaoyangna
|
2fbe372c76
|
四灵修改提交
|
2021-08-27 18:39:45 +08:00 |
jiaoyangna
|
cd594275e0
|
四灵试炼修改提交
|
2021-08-26 17:25:02 +08:00 |
jiaoyangna
|
d0d4d68b77
|
冲突预设修改提交
|
2021-08-10 14:48:20 +08:00 |
jiaoyangna
|
6b8c2f2f3c
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
|
2021-08-06 11:15:13 +08:00 |
DESKTOP-98AVA47\Administrator
|
dda2c78b05
|
预设修改提交
|
2021-07-15 19:59:54 +08:00 |
ZhangBiao
|
37dd3100b9
|
【心愿抽卡】文字内容颜色调整
|
2021-07-15 13:44:46 +08:00 |
gaoxin
|
9c58070aa8
|
Merge branch 'china/dev-c' into china/dev
# Conflicts:
# Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
# Assets/ManagedResources/BG/t_tehuishenzhuang_ditu.png.meta
# Assets/ManagedResources/DynamicAtlas/s_suoxiangpimi_banner_zh.png.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua
# Assets/Scripts/Editor/GameEditor/FrameTool/ConfigWindow.cs
|
2021-07-06 15:27:09 +08:00 |
ZhangBiao
|
241f780a15
|
【心愿抽卡】概率显示修改
|
2021-07-05 16:31:13 +08:00 |
ZhangBiao
|
a37fd67704
|
【特惠神装】基本完成
|
2021-07-01 19:56:28 +08:00 |
ZhangBiao
|
bbe3fec745
|
【心愿抽卡】界面微调
|
2021-07-01 17:31:55 +08:00 |
jiaoyangna
|
fbfb637231
|
【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
|
2021-06-30 20:39:20 +08:00 |
ZhangBiao
|
00ad684deb
|
【心愿抽卡】QA
|
2021-06-30 13:51:47 +08:00 |
ZhangBiao
|
fc5a91522a
|
【心愿抽卡】提交
|
2021-06-29 20:29:22 +08:00 |
ZhangBiao
|
262b52c4aa
|
【心愿抽卡】代码基本完成
|
2021-06-29 18:10:15 +08:00 |
ZhangBiao
|
cc16057438
|
【心愿抽卡】接协议
|
2021-06-29 15:25:05 +08:00 |
ZhangBiao
|
69581dcaa1
|
【心愿抽卡】开坑
|
2021-06-29 11:30:26 +08:00 |
jiaoyangna
|
3c41e96caa
|
【ID1016874】
【适配】限时召唤、灵兽宝阁、乾坤宝盒全面屏适配问题
(cherry picked from commit 1ec5cc7b05)
|
2021-06-28 18:36:01 +08:00 |
jiaoyangna
|
1ec5cc7b05
|
【ID1016874】
【适配】限时召唤、灵兽宝阁、乾坤宝盒全面屏适配问题
|
2021-06-28 18:34:19 +08:00 |
jiaoyangna
|
b83e8902d7
|
【ID1009368】
添加升星预览功能
|
2021-06-16 11:16:41 +08:00 |
ZhangBiao
|
c98aa8c703
|
【修行】增加属性提升提示
|
2021-06-01 13:54:21 +08:00 |
wangzhenxing
|
b1fcc5d4e5
|
[限时活动,福利红包]=======bug修改
|
2021-05-29 20:36:26 +08:00 |
jiaoyangna
|
5dc0ea68ab
|
无尽副本提交
|
2021-05-27 15:35:10 +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 |
jiaoyangna
|
33834cc9b2
|
Merge branch 'china/dev-c' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Atlas/FourElement.meta
# Assets/ManagedResources/Atlas/FourElement/ArtFont/s_silingshilian_yitongguan_zh.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_daodi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_di.jpg.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_fodi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_rendi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_renjieshiliandi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shilianjianglidi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shoudi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_yaodi.png.meta
# Assets/ManagedResources/LuaBytes.meta
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua.meta
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua.meta
# 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/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
# Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
|
2021-05-24 16:39:34 +08:00 |
ZhangBiao
|
43a817235f
|
【修行】英雄选择附身中
|
2021-05-24 16:38:30 +08:00 |
jiaoyangna
|
c68da98b84
|
Merge branch 'china/dev-c' into 0优化/无尽副本
|
2021-05-24 14:43:42 +08:00 |
jiaoyangna
|
1f914e4ae9
|
预设提交
|
2021-05-24 14:40:54 +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 |
ZhangBiao
|
d9b465c7cf
|
【修行】英雄选择界面修改
|
2021-05-24 12:02:20 +08:00 |
ZhangBiao
|
dade783281
|
【修行】英雄选择界面修改
|
2021-05-24 11:53:44 +08:00 |
ZhangBiao
|
daf5a675f8
|
【修行】预览界面资源添加
|
2021-05-22 18:52:49 +08:00 |
jiaoyangna
|
7cc12e74a8
|
无尽修改提交
|
2021-05-22 14:08:34 +08:00 |
jiaoyangna
|
30a6a41fe6
|
无尽副本修改提交
|
2021-05-21 16:39:08 +08:00 |
ZhangBiao
|
abcc89c68f
|
【修行】选择神将从generalpopup到bigpopup
|
2021-05-20 20:23:22 +08:00 |
gaoxin
|
239f8c50e4
|
【社稷大典】奖励提示添加
|
2021-05-20 16:51:09 +08:00 |
ZhangBiao
|
7d5de9d23a
|
【修行】恭喜破镜
|
2021-05-19 18:27:57 +08:00 |
ZhangBiao
|
3bb85fd5db
|
【修行】新增通用恭喜界面
|
2021-05-19 16:56:49 +08:00 |
ZhangBiao
|
e491f58adc
|
【修行】提交
|
2021-05-19 16:14:09 +08:00 |
ZhangBiao
|
bcf845ae38
|
【修行】玩家信息界面怎加技能详情
|
2021-05-18 16:13:26 +08:00 |
ZhangBiao
|
f3cb51c858
|
【预设冲突】冲突修改后提交
|
2021-05-17 10:35:58 +08:00 |
ZhangBiao
|
8003c43f71
|
Merge branch 'china/dev-c' into 0功能/修行玩法
|
2021-05-17 10:32:30 +08:00 |
ZhangBiao
|
307c2c1e37
|
【冲突处理】复制general(big)popup
|
2021-05-17 10:31:45 +08:00 |
ZhangBiao
|
29b8fd144e
|
Revert "【修行】提交,预设冲突处理"
This reverts commit 79910218c5.
|
2021-05-17 10:29:34 +08:00 |
ZhangBiao
|
79910218c5
|
【修行】提交,预设冲突处理
|
2021-05-17 10:21:08 +08:00 |
ZhangBiao
|
d5799c1030
|
【修行】神印界面提交
|
2021-05-12 18:24:50 +08:00 |
ZhangBiao
|
7d63d1e191
|
【修行】提交
|
2021-05-12 17:40:38 +08:00 |
jiaoyangna
|
f88ccd8f68
|
[主题活动修改提交]
|
2021-05-10 10:06:53 +08:00 |
zhangqiang
|
132e4c1260
|
【bug】奖励排行拉不到底部
|
2021-04-07 10:30:47 +08:00 |
jiaoyangna
|
05769016cb
|
四灵修改提交
|
2021-03-09 17:18:45 +08:00 |
jiaoyangna
|
aad4fcb9ac
|
四灵修改提交
|
2021-03-08 17:32:16 +08:00 |